changes for hw2.3