Updated Assignment 5