Expanded macros. Second try