replaced location with lat and long