Final Changes Before Midterm Demo