Added some macros back in from original