updated to use locations table instead of people