Chap. 3.8 changes