Final Updated Assignment code