GPS refactoring and reorganization, more precise GPS delay