chap 4 & 6 part 2 commit