changed to use short version of macros