Final Changes to Assignment2