Expanded macros. 5'th try