Revert "more changes"

This reverts commit 5b78c68f84e5ec0ebd2c31ab2b98a1771ee1f9f1.
Revert 5b78c68..999095b

This rolls back to commit 5b78c68f84e5ec0ebd2c31ab2b98a1771ee1f9f1.
ADDED LOCATION SERVICE

LS