Behavior changes, townsfolk
Merge fix