Putting my changes back in