Fix some changes to start discussing with the GPS