Updated Assignment2