Updated Assignment 1