Updates for chapters 6s, 11 and 11s