Smarter macros and logic started