Changed geo-location code due to bugs