Added current location functionality