Updated Assignment #7