Changes to assignment 1