Updating with changes from gps_comm.