diff --git a/src/modules/proposal/services/__tests__/proposal-contracting.service.spec.ts b/src/modules/proposal/services/__tests__/proposal-contracting.service.spec.ts
index 4c30942..7c2e5c9 100644
--- a/src/modules/proposal/services/__tests__/proposal-contracting.service.spec.ts
+++ b/src/modules/proposal/services/__tests__/proposal-contracting.service.spec.ts
@@ -13,7 +13,13 @@ import { SignContractDto } from '../../dto/sign-contract.dto';
 import { ProposalStatus } from '../../enums/proposal-status.enum';
 import { ProposalDocument } from '../../schema/proposal.schema';
 import { addContractSign } from '../../utils/add-contract-sign.util';
-import { addDizApproval, addUacApproval, addUacApprovalWithCondition } from '../../utils/add-location-vote.util';
+import {
+  addDizApproval,
+  addUacApprovalWithCondition,
+  addDizConditionReview,
+  addDizApprovalWithCondition,
+  addDizConditionApproval,
+} from '../../utils/add-location-vote.util';
 import {
   addHistoryItemForContractSign,
   addHistoryItemForDizApproval,
@@ -49,7 +55,7 @@ jest.mock('../../utils/add-location-vote.util', () => ({
   addDizApproval: jest.fn(),
   addUacApproval: jest.fn(),
   addUacApprovalWithCondition: jest.fn(),
-  addUacConditionReview: jest.fn(),
+  addDizConditionReview: jest.fn(),
 }));
 jest.mock('../../utils/revert-location-vote.util', () => ({
   revertLocationVote: jest.fn(),
@@ -233,13 +239,20 @@ describe('ProposalContractingService', () => {
         expect(addUpload).toHaveBeenCalledWith(proposalDocument, expect.objectContaining({ blobName: 'blobName' }));
         expect(addUacApprovalWithCondition).toHaveBeenCalledWith(
           proposalDocument,
-          request.user.miiLocation,
-          expect.objectContaining({ blobName: 'blobName' }),
+          request.user,
           vote,
+          expect.objectContaining({ blobName: 'blobName' }),
+          undefined,
         );
         expect(storageService.uploadFile).toHaveBeenCalledWith('blobName', file, request.user);
       } else {
-        expect(addUacApproval).toHaveBeenCalledWith(proposalDocument, request.user, vote);
+        expect(addUacApprovalWithCondition).toHaveBeenCalledWith(
+          proposalDocument,
+          request.user,
+          vote,
+          undefined,
+          undefined,
+        );
       }
     });
   });
diff --git a/src/modules/proposal/services/__tests__/proposal-crud.service.spec.ts b/src/modules/proposal/services/__tests__/proposal-crud.service.spec.ts
index 98da8ae..5583435 100644
--- a/src/modules/proposal/services/__tests__/proposal-crud.service.spec.ts
+++ b/src/modules/proposal/services/__tests__/proposal-crud.service.spec.ts
@@ -250,9 +250,11 @@ describe('ProposalCrudService', () => {
         ['reports.content']: 1,
         owner: 1,
         conditionalApprovals: 1,
+        locationConditionDraft: 1,
         openDizChecks: 1,
         dizApprovedLocations: 1,
         uacApprovedLocations: 1,
+        openDizConditionChecks: 1,
         signedContracts: 1,
         requestedButExcludedLocations: 1,
       };
@@ -277,6 +279,8 @@ describe('ProposalCrudService', () => {
         owner: 1,
         conditionalApprovals: 1,
         dizApprovedLocations: 1,
+        locationConditionDraft: 1,
+        openDizConditionChecks: 1,
         uacApprovedLocations: 1,
         signedContracts: 1,
         requestedButExcludedLocations: 1,
diff --git a/src/modules/proposal/services/__tests__/status-change.service.spec.ts b/src/modules/proposal/services/__tests__/status-change.service.spec.ts
index fe5b1c6..b773ae6 100644
--- a/src/modules/proposal/services/__tests__/status-change.service.spec.ts
+++ b/src/modules/proposal/services/__tests__/status-change.service.spec.ts
@@ -67,6 +67,7 @@ const proposalContent = {
   requestedButExcludedLocations: [],
   openDizChecks: [MiiLocation.Charité, MiiLocation.KC],
   dizApprovedLocations: [MiiLocation.KUM, MiiLocation.MHH],
+  openDizConditionChecks: [MiiLocation.CTK],
   signedContracts: [MiiLocation.MRI, MiiLocation.UKA],
   uacApprovedLocations: [MiiLocation.UKAU, MiiLocation.UKB],
   uacApprovals: [{}] as UacApproval[],
diff --git a/src/modules/proposal/services/status-change.service.ts b/src/modules/proposal/services/status-change.service.ts
index b285892..4ad0f0d 100644
--- a/src/modules/proposal/services/status-change.service.ts
+++ b/src/modules/proposal/services/status-change.service.ts
@@ -70,7 +70,7 @@ export class StatusChangeService {
 
         proposalAfterChanges.statusChangeToLocationCheckAt = new Date();
 
-        //scheduleTypesToRemove.push(ScheduleType.ReminderFdpgCheck);
+        scheduleTypesToRemove.push(ScheduleType.ReminderFdpgCheck);
         scheduleTypesToAdd.push(
           ScheduleType.ReminderLocationCheck1,
           ScheduleType.ReminderLocationCheck2,
diff --git a/src/modules/proposal/utils/__tests__/location-flow.util.spec.ts b/src/modules/proposal/utils/__tests__/location-flow.util.spec.ts
index e1e0860..5eeac62 100644
--- a/src/modules/proposal/utils/__tests__/location-flow.util.spec.ts
+++ b/src/modules/proposal/utils/__tests__/location-flow.util.spec.ts
@@ -29,6 +29,7 @@ const proposalContent = {
   openDizChecks: [MiiLocation.UKL],
   dizApprovedLocations: [MiiLocation.UKM],
   uacApprovedLocations: [MiiLocation.UKMR],
+  openDizConditionChecks: [MiiLocation.Charité],
   signedContracts: [MiiLocation.UKR],
   requestedButExcludedLocations: [MiiLocation.UKD],
   conditionalApprovals: [conditionalApproval],
@@ -70,6 +71,7 @@ describe('location-flow.util', () => {
       expect(proposal.openDizChecks.length).toEqual(0);
       expect(proposal.dizApprovedLocations.length).toEqual(1);
       expect(proposal.uacApprovedLocations.length).toEqual(1);
+      expect(proposal.openDizConditionChecks.length).toEqual(1);
       expect(proposal.signedContracts.length).toEqual(1);
       expect(proposal.requestedButExcludedLocations.length).toEqual(1);
     });
diff --git a/src/modules/proposal/utils/__tests__/revert-location-vote.util.spec.ts b/src/modules/proposal/utils/__tests__/revert-location-vote.util.spec.ts
index a438163..68ee493 100644
--- a/src/modules/proposal/utils/__tests__/revert-location-vote.util.spec.ts
+++ b/src/modules/proposal/utils/__tests__/revert-location-vote.util.spec.ts
@@ -76,6 +76,7 @@ describe('revertLocationVoteUtil', () => {
     isDizCheck: false,
     dizApproved: false,
     uacApproved: false,
+    openDizConditionChecks: false,
     isConditionalApproval: false,
     conditionalApprovalAccepted: false,
     conditionalApprovalDeclined: false,