Added code to handle GPS/baro choices