Bringup changes