GPS Precalculation modified
Merging