Make the termination criteria much stricter now