pushing all the changes we did in class