Updated for location manager