- added location logic