Added in location checking