- added more macros