Update my changes from chapters 10-12.