updated macros to account for dytt