Assignment 1 changes