Now compiles.
Changes are from instructor's email.