these are the changes we made in class