Fixed to latest version as indicated in HW6