[Jackie] merge with Jennifer's gyro, compass and bumper