added 1.1 macros