Changes for moving gears, districts and unit tests