added current location logic