updated for chapter 7 work layout