More reasonable end criteria