Added code to retrieve current location