refactor ch. 32
update ch. 32
update ch. 32