Updated to Assignment 3