updated for midterm