Re-did all of my changes