Changes to come closer to spec