Condense macros to three
Change infomration in doc to relfect macro changes