Assignment 2 changes