added all of my changes