Added code to get current location