Now with Assignment7