Update through Assignment 7