Changes to termination condition