B-55703 Changed hard delays to conditional delays