added addiotnal macros