added more macros