Final changes from summer course.