Added functionality to TownHall Macro