All changes for assignment 1