Add in run macro as well