Added ability to check locations