added macros chap10