Modified Assignment2