Finished the work for the Midterm Update