Revert "location check working"

This reverts commit 11fad55e41b71fb741ba7dafbc50e215af106f09.
Revert "Revert "location check working""

This reverts commit 501a93c32316f5fb2647f659d362e1c461df0201.