Updated Assignment 3