Chapter 4 for review

+1 for the undef safety check