Tweaked iteration conditions