2 more macros converted