Basline chapter 5 commit