updates to ch.17