Updated from feedhenry3 branch