Merged with Juan's last commit that nuked the gyro