Add ch 8, minor edit on ch 2