made choose boroughs dyanmic
6 pm
resolve merge conflicts