Adjusted termination criteria