stop conditions rework