Before GPS Refactoring