Include changes from 5.6 Exercises.