added compatiblity macros, removed use of macros not use to allow for R14