implementing aarons changes
implementing aarons changes