Changes to assignment 2