Adding checks for user location
Adding checks for user location