added Macros