Updates for Assignment2