Improved midterm, based on Sunday's workshop