some tinkering from the Townsend office