Updated Assignment 8