Curtis' changes.