updates from feedhenry3 branch