Changes from the chap 6 exercises