Updated Assignment A