pulled back/improved some of the changed made by Da Ott