added all macros