chapter 10 macros stuff added