adjust to new macros