Revert "changed location variables"

This reverts commit 6cd1ee854d468a143e5021dbb0c14cf32c808f22.