Expanded macros. Third try