Adding location check