Completed the merge of Chapters 4 and 5