added macros, simplyfing and shortening magazine definitions