Improve Macro section