Adding the rest of my changes