Finish up macros