Expanded macros. First try