diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java
index ccfc80613..81b2cd3bb 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionBnSession.java
@@ -128,15 +128,17 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali
             if (firstReviseMonitor != null && isMonitorPassed(firstReviseMonitor, req.getRequestPayload())) {
                 firstReviseMonitor = null;
                 firstPart();
+                return;
             }
             if (afterPaymentsSdf4And13Monitor != null && isMonitorPassed(afterPaymentsSdf4And13Monitor, req.getRequestPayload())) {
                 afterPaymentsSdf4And13Monitor = null;
-                sendSdf56();
-            }
-            if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
-                afterPaymentsReviseMonitor = null;
                 finishPart();
+                return;
             }
+            //if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
+            //    afterPaymentsReviseMonitor = null;
+            //    finishPart();
+            //}
         } catch (StageException e) {
             //already logged
         }
@@ -189,11 +191,13 @@ public class PrimaryAuctionBnSession extends AbstractSession implements Initiali
                 paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction);
             }
             if (paymentResult.getStageResult().isEmpty()) {
-                log.info("no payment instructions were created, sending SDF56");
-                sendSdf56();
+                log.info("no payment instructions were created");
+                finishPart();
             } else {
-                log.info("created {} PaymentInstructions, waiting for SDF04/SDF13", paymentResult.getStageResult().size());
-                this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.paymentsWereCreated(section());
+                this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.waitStep7(section());
+                log.info("created {} PaymentInstructions, waiting for {}",
+                        paymentResult.getStageResult().size(),
+                        this.afterPaymentsSdf4And13Monitor.allConditions());
             }
         } catch (StageException e) {
             //already logged
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java
index df42c6510..77534c8d1 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/PrimaryAuctionT0Session.java
@@ -128,15 +128,17 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali
             if (firstReviseMonitor != null && isMonitorPassed(firstReviseMonitor, req.getRequestPayload())) {
                 firstReviseMonitor = null;
                 firstPart();
+                return;
             }
             if (afterPaymentsSdf4And13Monitor != null && isMonitorPassed(afterPaymentsSdf4And13Monitor, req.getRequestPayload())) {
                 afterPaymentsSdf4And13Monitor = null;
-                sendSdf56();
-            }
-            if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
-                afterPaymentsReviseMonitor = null;
                 finishPart();
+                return;
             }
+            //if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
+            //    afterPaymentsReviseMonitor = null;
+            //    finishPart();
+            //}
         } catch (StageException e) {
             //already logged
         }
@@ -188,11 +190,13 @@ public class PrimaryAuctionT0Session extends AbstractSession implements Initiali
                 paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction);
             }
             if (paymentResult.getStageResult().isEmpty()) {
-                log.info("no payment instructions were created, sending SDF56");
-                sendSdf56();
+                log.info("no payment instructions were created");
+                finishPart();
             } else {
-                log.info("created {} PaymentInstructions, waiting for SDF04/SDF13", paymentResult.getStageResult().size());
-                this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.paymentsWereCreated(section());
+                this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.waitStep7(section());
+                log.info("created {} PaymentInstructions, waiting for {}",
+                        paymentResult.getStageResult().size(),
+                        this.afterPaymentsSdf4And13Monitor.allConditions());
             }
         } catch (StageException e) {
             //already logged
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java
index b808cc95a..a6fbf2c89 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/ReturnDepositSession.java
@@ -119,15 +119,17 @@ public class ReturnDepositSession extends AbstractSession implements Initializin
             if (firstReviseMonitor != null && isMonitorPassed(firstReviseMonitor, req.getRequestPayload())) {
                 firstReviseMonitor = null;
                 firstPart();
+                return;
             }
             if (afterPaymentsSdf4Monitor != null && isMonitorPassed(afterPaymentsSdf4Monitor, req.getRequestPayload())) {
                 afterPaymentsSdf4Monitor = null;
-                sendSdf56();
-            }
-            if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
-                afterPaymentsReviseMonitor = null;
                 finishPart();
+                return;
             }
+            //if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
+            //    afterPaymentsReviseMonitor = null;
+            //    finishPart();
+            //}
         } catch (StageException e) {
             //already logged
         }
@@ -167,11 +169,13 @@ public class ReturnDepositSession extends AbstractSession implements Initializin
                 paymentResult = runStage(TaskType.FormingPaymentInstruction, payload, formingPaymentInstruction);
             }
             if (paymentResult == null || paymentResult.getStageResult().isEmpty()) {
-                log.info("no payment instructions were created, sending SDF56");
-                sendSdf56();
+                log.info("no payment instructions were created");
+                finishPart();
             } else {
-                log.info("created {} PaymentInstructions, waiting for SDF04", paymentResult.getStageResult().size());
-                this.afterPaymentsSdf4Monitor = SessionMonitorFactory.paymentsWereCreated(section());
+                this.afterPaymentsSdf4Monitor = SessionMonitorFactory.waitStep7(section());
+                log.info("created {} PaymentInstructions, waiting for {}",
+                        paymentResult.getStageResult().size(),
+                        this.afterPaymentsSdf4Monitor.allConditions());
             }
         } catch (StageException e) {
             //already logged
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java
index d6a8923ad..61148f3a2 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/stage/SecondaryAuctionT0Session.java
@@ -122,15 +122,17 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia
             if (firstReviseMonitor != null && isMonitorPassed(firstReviseMonitor, req.getRequestPayload())) {
                 firstReviseMonitor = null;
                 firstPart();
+                return;
             }
             if (afterPaymentsSdf4And13Monitor != null && isMonitorPassed(afterPaymentsSdf4And13Monitor, req.getRequestPayload())) {
                 afterPaymentsSdf4And13Monitor = null;
-                sendSdf56();
-            }
-            if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
-                afterPaymentsReviseMonitor = null;
                 finishPart();
+                return;
             }
+            //if (afterPaymentsReviseMonitor != null && isMonitorPassed(afterPaymentsReviseMonitor, req.getRequestPayload())) {
+            //    afterPaymentsReviseMonitor = null;
+            //    finishPart();
+            //}
         } catch (StageException e) {
             //already logged
         }
@@ -183,11 +185,13 @@ public class SecondaryAuctionT0Session extends AbstractSession implements Initia
             }
 
             if (paymentResult.getStageResult().getPaymentInstructions().isEmpty()) {
-                log.info("no payment instructions were created, sending SDF56");
-                sendSdf56();
+                log.info("no payment instructions were created");
+                finishPart();
             } else {
-                log.info("created {} PaymentInstructions, waiting for SDF04/SDF13", paymentResult.getStageResult().getPaymentInstructions().size());
-                this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.paymentsWereCreated(section());
+                this.afterPaymentsSdf4And13Monitor = SessionMonitorFactory.waitStep7(section());
+                log.info("created {} PaymentInstructions, waiting for {}",
+                        paymentResult.getStageResult().getPaymentInstructions().size(),
+                        this.afterPaymentsSdf4And13Monitor.allConditions());
             }
         } catch (StageException e) {
             //already logged