Pulling in recent changes to erholmes

see title