Updated macros and comments