Final commit for ch2