Clayton: added Aarons changes