data structure changes, added distance to locations