changed the AO templates to reflect desired usability