Updated macros to (hopefully) speed up running them.