This now runs the way it should