Updating to use macros