various changes to support It Takes a Village