refactored boroughs