Added all of my changes