forgot to merge part of town.h