Updated for location
Updated for location