Feature/chapt05 revisions