Fix to save battery by using GPS less.

Fix to, hopefully, save battery by using GPS less.