Updates on ch. 4 and 11