Changes to assignment 5