Latest updated to generate_macros