Chapter 3 changes, up to 'creating a catalyst controller...'