NSX and CB7 Updates