Added current location, distance calculation