Refactoring / working on GPS.