removed todo in chap. 2