Update to assignment2