Final Chapter5 commit