Final changes. All chapter seven tests have passed.