GPS work + DF changes