Updated for Midterm1