Made all my changes