My changes for assignment2