Modified some components of the GPS detection mechanism