Put these functions back where they were to make review simpler.