changed logic in locations and coordinate areas