diff --git a/input/fsh/CLL/recommendation-CLL-3-11/Intervention-a.fsh b/input/fsh/CLL/recommendation-CLL-3-11/Intervention-a.fsh
index 3fb37a8..1a28002 100644
--- a/input/fsh/CLL/recommendation-CLL-3-11/Intervention-a.fsh
+++ b/input/fsh/CLL/recommendation-CLL-3-11/Intervention-a.fsh
@@ -119,10 +119,7 @@ Description: "Anamnese bei CLL Patienten"
 * status = #active
 * description = "Anamnese bei CLL Patienten"
 * code = $sct#84100007 "History taking"
-* timingTiming.repeat.count = 1 //TODO ich hab das hier als Vorschlag, wenn inordnung: bei allen assessment actions umsetzen  :)
-* timingTiming.repeat.period = 4
-* timingTiming.repeat.periodUnit = #wk
-
+* insert rs-timingCLL(1,4) 
 
 Instance: PhysicalExaminationCLL
 InstanceOf: assessment-action    
@@ -134,7 +131,7 @@ Description: "Körperliche Untersuchung bei CLL Patienten"
 * status = #active
 * description = "Körperliche Untersuchung bei CLL Patienten"
 * code = $sct#5880005 "Physical examination"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: ExaminationLymphaticNodesCLL
 InstanceOf: assessment-action    
@@ -146,7 +143,7 @@ Description: "vollständiger Erhebung des peripheren Lymphknotenstatus"
 * status = #active
 * description = "vollständiger Erhebung des peripheren Lymphknotenstatus"
 * code = $sct#284427004 "Examination of lymph nodes (procedure)"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: ExaminationSpleenSizeCLL
 InstanceOf: assessment-action  
@@ -158,7 +155,7 @@ Description: "Abschätzung der Milzgröße bei CLL"
 * status = #active
 * description = "Abschätzung der Milzgröße bei CLL"
 * code = $sct#47241002 "Palpation of spleen (procedure)"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: ExaminationLiverSizeCLL
 InstanceOf: assessment-action   
@@ -170,7 +167,7 @@ Description: "Abschätzung der Lebergröße bei CLL"
 * status = #active
 * description = "Abschätzung der Lebergröße bei CLL"
 * code = $sct#172488004 "Palpation of liver (procedure)"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: AbdomialUltrasonographyCLL
 InstanceOf: assessment-action   
@@ -182,7 +179,7 @@ Description: "Abdomensonographie bei CLL"
 * status = #active
 * description = "Abdomensonographie bei CLL"
 * code = $sct#45036003 "Ultrasonography of abdomen"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: AssessmentECOGScoreCLL
 InstanceOf: assessment-action    
@@ -194,7 +191,7 @@ Description: "Assesment of the ECOG Score CLL"
 * status = #active
 * description = "Assesment of the ECOG Score CLL"
 * code = $sct#423740007 "ECOG performance status"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: AssessmentKarnofskyIndexCLL
 InstanceOf: assessment-action    
@@ -206,7 +203,7 @@ Description: "Assesment Karnofsky-Index CLL"
 * status = #active
 * description = "Assesment Karnofsky-Index CLL"
 * code = $sct#273546003 "Karnofsky performance status"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: AssessmentComorbiditiesCLL
 InstanceOf: assessment-action   
@@ -218,7 +215,7 @@ Description: "Assesment Comorbidities CLL"
 * status = #active
 * description = "Assesment Comorbidities CLL"
 * code = $sct#398192003 "Co-morbid conditions (finding)"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: CompleteBloodCountAutomatedCLL
 InstanceOf: assessment-action   
@@ -230,7 +227,7 @@ Description: "Maschinelles Differentialblutbild CLL"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#9564003 "Complete blood count with white cell differential, automated"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: MicroscopyWhiteBloodCellCountCLL
 InstanceOf: assessment-action    
@@ -242,7 +239,7 @@ Description: "Mikroskopisches Differentialblutbild"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#35774004 "Complete blood count with white cell differential, manual (procedure)"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: ClinicalChemistryTestCLL
 InstanceOf: assessment-action
@@ -254,7 +251,7 @@ Description: "Klinische Chemie"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#275711006 "Serum chemistry test (procedure)"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: HIVSerologyCLL
 InstanceOf: assessment-action    
@@ -266,7 +263,7 @@ Description: "HIV Serologie"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#171121004 "Human immunodeficiency virus screening (procedure)"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: HBVSerologyCLL
 InstanceOf: assessment-action    
@@ -278,7 +275,7 @@ Description: "HBV Serologie"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#171122006 "Hepatitis B screening (procedure)"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: HCVSerologyCLL
 InstanceOf: assessment-action   
@@ -290,7 +287,7 @@ Description: "HCV Serologie"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#413107006 "Hepatitis C screening (procedure)"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: HEVSerologyCLL
 InstanceOf: assessment-action   
@@ -302,7 +299,7 @@ Description: "HEV Serologie"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#36446003 "Hepatitis E virus measurement (procedure)"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: BinetStagingCLL
 InstanceOf: assessment-action    
@@ -314,7 +311,7 @@ Description: "Bestimmung des aktuellen klinischen Stadiums (Binet Staging) CLL"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#1149099005 "Binet staging classification for chronic lymphocytic leukemia"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: PregnancyTestbHCGCLL
 InstanceOf: assessment-action   
@@ -326,7 +323,7 @@ Description: "Pregnancy Test betaHCG CLL"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#44789311 "Pregnancy test (beta human chorionic gonadotropin) (procedure)"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 
 
@@ -340,7 +337,7 @@ Description: "CMV IgG Antikörper Bestimmung"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#64681000237105 "CMV (cytomegalovirus) IgG antibody in serum qualitative result"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: CMVAntibodyIgMCLL
 InstanceOf: assessment-action   
@@ -352,7 +349,7 @@ Description: "CMV IgM Antikörper Bestimmung"
 * insert publisher-experimental-version
 * status = #active
 * code = $sct#62681000237103 "CMV (cytomegalovirus) IgM antibody in serum qualitative result"
-* timingTiming.repeat.count = 1
+* insert rs-timingCLL(1,4)
 
 Instance: CMVPCRCLL
 InstanceOf: assessment-action   
@@ -366,5 +363,5 @@ Description: "CMV PCR Viruslast Bestimmung"
 * code = $sct#1107381000000101 "Cytomegalovirus viral load"
 * timingTiming.repeat
   * frequency = 1
-  * period = 30 // bisher nicht klar nur "regelmäßig"
-  * periodUnit = $ucum#d "day" 
+  * period = 2 
+  * periodUnit = $ucum#wk "week" 
diff --git a/input/fsh/CLL/recommendation-CLL-3-11/population-a.fsh b/input/fsh/CLL/recommendation-CLL-3-11/population-a.fsh
index d4e0ec2..a615f22 100644
--- a/input/fsh/CLL/recommendation-CLL-3-11/population-a.fsh
+++ b/input/fsh/CLL/recommendation-CLL-3-11/population-a.fsh
@@ -10,33 +10,16 @@ Description: "Population mit einer Chronisch Lymphatische Leukämie und einem be
 * actual = false
 * name = "PopulationCLLPlanungOnkoTherapie"
 * description = "Population mit einer Chronisch Lymphatische Leukämie und einem behandlungsbedürftigen Progress"
-* characteristic[condition][+]
-  * code.coding[sct] = $sct#92814006:{246456000 = 288527008,263502005 = 255314001,47429007 = 225292002 }
-  //CLL:{Episodicity = New Episode,Clinical course = Progressive ,Associated with = Developing a treatment plan}
-
-/*
-* characteristic[+].definitionByCombination 
+* characteristic[0].definitionByCombination 
   * code = #all-of
-  * characteristic[condition][+] // TODO: CLL-Progress requiring treatment
-    * linkId = "CLL"
+  * characteristic[condition][+] 
+    //* linkId = "CLL"
     * definitionByTypeAndValue
       * type  = $sct#404684003 "Clinical finding (finding)"
       * valueCodeableConcept = $sct#92814006 "Chronic lymphoid leukaemia, disease"
-  * characteristic[procedure][+]
+  * characteristic[condition][+]
     * definitionByTypeAndValue
-      * type = $sct#71388002 "Procedure (procedure)"
-      * valueCodeableConcept = $sct#225292002 "Developing a treatment plan"
-  * characteristic[0].exclude = false
-
-FULL PCE:  
-92814006 |Chronic lymphoid leukemia, disease (disorder)|:
-{363698007 |Finding site  (attribute)| = 14016003 |Bone marrow structure (body structure)|,
-116676008 |Associated morphology  (attribute)| = 51092000 |B-cell chronic lymphocytic leukemia/small lymphocytic lymphoma (morphologic abnormality)|,
-246456000 |Episodicity (attribute)| = 288527008 |New episode (qualifier value)|,
-263502005 |Clinical course (attribute)| = 255314001 |Progressive (qualifier value)|,
-47429007 |Associated with (attribute)| = 225292002 |Developing a treatment plan (procedure)|}
-
-*/
+      * valueCodeableConcept = $cs-cll#dprnt "Disease progression that requires adapted or new treatment"
 
 
 
@@ -44,22 +27,20 @@ Instance: PopulationCLLPlanungOnkoTherapieFertileFemale
 InstanceOf: recommendation-eligibility-criteria
 Usage: #definition
 Title: "Population: CLL und Planung Onkologische Therapielinie gebährfähige Frauen"
-Description: "Population die eine Chronisch Lymphatische Leukämie hat, weiblich und in einem gebährfähigen Alter ist und bei der eine Therapieplanung ansteht"
+Description: "Population mit einer Chronisch Lymphatische Leukämie, einem behandlungsbedürftigen Progress und weiblich in einem gebährfähigen Alter"
 * status = #active 
 * actual = false
 * name = "PopulationCLLPlanungOnkoTherapieFertileFemale"
-* description = "Population die eine Chronisch Lymphatische Leukämie hat, weiblich und in einem gebährfähigen Alter ist und bei der eine Therapieplanung ansteht"
+* description = "Population mit einer Chronisch Lymphatische Leukämie, einem behandlungsbedürftigen Progress und weiblich in einem gebährfähigen Alter"
 * characteristic[0].definitionByCombination 
   * code = #all-of
   * characteristic[condition][+] 
-    //* linkId = "CLL"
     * definitionByTypeAndValue
       * type  = $sct#404684003 "Clinical finding (finding)"
       * valueCodeableConcept = $sct#92814006 "Chronic lymphoid leukaemia, disease"
-  * characteristic[procedure][+]
+  * characteristic[condition][+]
     * definitionByTypeAndValue
-      * type = $sct#71388002 "Procedure (procedure)"
-      * valueCodeableConcept = $sct#225292002 "Developing a treatment plan"
+      * valueCodeableConcept = $cs-cll#dprnt "Disease progression that requires adapted or new treatment"
   * characteristic[condition][+] 
     * definitionByTypeAndValue
       * type  = $sct#404684003 "Clinical finding (finding)"
@@ -70,12 +51,12 @@ Description: "Population die eine Chronisch Lymphatische Leukämie hat, weiblich
 Instance: PopulationCLLPlanungOnkoTherapieIdelalisib
 InstanceOf: recommendation-eligibility-criteria
 Usage: #definition
-Title: "Population: CLL und Planung Onkologische Therapielinie mit Idelalisib Frauen"
-Description: "Population die eine Chronisch Lymphatische Leukämie hat und bei der eine Therapieplanung mit Idelalisib ansteht"
+Title: "Population: CLL und Planung Onkologische Therapielinie mit Idelalisib"
+Description: "Population mit einer Chronisch Lymphatische Leukämie, einem behandlungsbedürftigen Progress und bei der eine Therapieplanung mit Idelalisib ansteht"
 * status = #active 
 * actual = false
 * name = "PopulationCLLPlanungOnkoTherapieIdelalisib"
-* description = "Population die eine Chronisch Lymphatische Leukämie hat und bei der eine Therapieplanung mit Idelalisib ansteht"
+* description = "Population mit einer Chronisch Lymphatische Leukämie, einem behandlungsbedürftigen Progress und bei der eine Therapieplanung mit Idelalisib ansteht"
 * characteristic[0].definitionByCombination 
   * code = #all-of
   * characteristic[condition][+] 
@@ -83,13 +64,9 @@ Description: "Population die eine Chronisch Lymphatische Leukämie hat und bei d
     * definitionByTypeAndValue
       * type  = $sct#404684003 "Clinical finding (finding)"
       * valueCodeableConcept = $sct#92814006 "Chronic lymphoid leukaemia, disease"
-  * characteristic[procedure][+]
+  * characteristic[condition][+]
     * definitionByTypeAndValue
-      * type = $sct#71388002 "Procedure (procedure)"
-      * valueCodeableConcept = $sct#225292002 "Developing a treatment plan"
-  * characteristic[drugAdministration][+]
-    * definitionByTypeAndValue
-      * valueCodeableConcept = $sct#105590001 "Idelalisib"
+      * valueCodeableConcept = $cs-cll#dprnti "Disease progression that requires adapted or new treatment with idelalisib"
   * characteristic[0].exclude = false
   
 Instance: PopulationCLLOnkoTherapieIdelalisib
diff --git a/input/fsh/CLL/recommendation-CLL-4-1/Intervention-a.fsh b/input/fsh/CLL/recommendation-CLL-4-1/Intervention-a.fsh
index d8b5695..6f6faea 100644
--- a/input/fsh/CLL/recommendation-CLL-4-1/Intervention-a.fsh
+++ b/input/fsh/CLL/recommendation-CLL-4-1/Intervention-a.fsh
@@ -50,4 +50,4 @@ Description: "Therapie Indikation bei CLL"
 * insert publisher-experimental-version
 * status = #active
 * description = "Therapie Indikation bei CLL"
-* code = $sct#708255002 "First line treatment"
\ No newline at end of file
+* code = $cs-cll#scllt "Systemic CLL therapy"
\ No newline at end of file
diff --git a/input/fsh/CLL/recommendation-CLL-4-1/population-a.fsh b/input/fsh/CLL/recommendation-CLL-4-1/population-a.fsh
index cdf6707..3729bc7 100644
--- a/input/fsh/CLL/recommendation-CLL-4-1/population-a.fsh
+++ b/input/fsh/CLL/recommendation-CLL-4-1/population-a.fsh
@@ -52,23 +52,21 @@ Description: "Population, bei der Binet A oder B sowie eine bestimmte klinische
         * valueCodeableConcept = $sct-uk#863761000000109 "Clinical stage B chronic lymphocytic leukaemia"
   * characteristic[+].definitionByCombination 
     * code = #any-of
-    * characteristic[+].definitionByCombination 
-      * code = #all-of
-      * characteristic[condition][+] 
-        * linkId = "CLL"
-        * definitionByTypeAndValue
-          * type  = $sct#404684003 "Clinical finding (finding)"
-          * valueCodeableConcept = $sct#161832001 "Weight decreasing"
-      * characteristic[condition][+] 
-        * linkId = "CLL"
-        * definitionByTypeAndValue
-          * type  = $sct#404684003 "Clinical finding (finding)"
-          * valueCodeableConcept = $sct#7520000 "Pyrexia of unknown origin"
-      * characteristic[condition][+] 
-        * linkId = "CLL"
-        * definitionByTypeAndValue
-          * type  = $sct#404684003 "Clinical finding (finding)"
-          * valueCodeableConcept = $sct#42984000 "Night sweats"
+    * characteristic[condition][+] 
+      * linkId = "CLL"
+      * definitionByTypeAndValue
+        * type  = $sct#404684003 "Clinical finding (finding)"
+        * valueCodeableConcept = $sct#161832001 "Weight decreasing"
+    * characteristic[condition][+] 
+      * linkId = "CLL"
+      * definitionByTypeAndValue
+        * type  = $sct#404684003 "Clinical finding (finding)"
+        * valueCodeableConcept = $sct#7520000 "Pyrexia of unknown origin"
+    * characteristic[condition][+] 
+      * linkId = "CLL"
+      * definitionByTypeAndValue
+        * type  = $sct#404684003 "Clinical finding (finding)"
+        * valueCodeableConcept = $sct#42984000 "Night sweats"
     * characteristic[+].definitionByCombination 
       * code = #all-of
       * characteristic[condition][+] 
@@ -79,7 +77,7 @@ Description: "Population, bei der Binet A oder B sowie eine bestimmte klinische
       * characteristic[observation][+] 
         * linkId = "CLL"
         * definitionByTypeAndValue
-          * type = $loinc#26453-1 "Erythrocytes [#/volume] in Blood"
+          * type = $loinc#718-7 "Hemoglobin [Mass/volume] in Blood"
           * valueCodeableConcept = $sct#260371004 "Decreasing"
     * characteristic[+].definitionByCombination 
       * code = #all-of  
@@ -95,14 +93,10 @@ Description: "Population, bei der Binet A oder B sowie eine bestimmte klinische
           * valueCodeableConcept = $sct#260371004 "Decreasing"
     * characteristic[+].definitionByCombination 
       * code = #all-of  
-      * characteristic[drugAdministration][+]
-        * definitionByTypeAndValue
-          //* type  = $sct#404684003 "Drug"
-          * valueCodeableConcept = $sct#304275008 "Corticosteroid and/or corticosteroid derivative"   
       * characteristic[condition][+]
         * definitionByTypeAndValue
           * type  = $sct#404684003 "Clinical finding (finding)"
-          * valueCodeableConcept = $sct#405786003 "Poor response to treatment"
+          * valueCodeableConcept = $cs-cll#porecotr "Poor response to corticosteroid treatment"
       * characteristic[+].definitionByCombination 
         * code = #any-of
         * characteristic[condition][+] 
@@ -120,19 +114,11 @@ Description: "Population, bei der Binet A oder B sowie eine bestimmte klinische
       * characteristic[observation][+]
         * linkId = "CLL"
         * definitionByTypeAndValue
-          * type  = $loinc#32489-7 "Spleen tip distance below costal margin"
-          * valueRange
-            * low = 6 'cm'
-      * characteristic[condition][+] 
-        * linkId = "CLL"
-        * definitionByTypeAndValue
-          * type  = $sct#404684003 "Clinical finding (finding)"
-          * valueCodeableConcept = $sct#830137004 "Pain due to enlargement of spleen"   
     * characteristic[observation][+]
       * linkId = "CLL"
       * definitionByTypeAndValue
-        * type  = $loinc#32489-7 "Spleen tip distance below costal margin"
-        * valueCodeableConcept = $sct#260369004 "Increasing"
+        * type  = $sct#404684003 "Clinical finding (finding)"
+        * valueCodeableConcept = $cs-cll#sycasp "Symptom-causing splenomegaly"
     * characteristic[+].definitionByCombination 
       * code = #all-of  
       * characteristic[observation][+] 
diff --git a/input/fsh/CLL/recommendation-CLL-4-3/Intervention-a.fsh b/input/fsh/CLL/recommendation-CLL-4-3/Intervention-a.fsh
index b50fc62..8c6ddf8 100644
--- a/input/fsh/CLL/recommendation-CLL-4-3/Intervention-a.fsh
+++ b/input/fsh/CLL/recommendation-CLL-4-3/Intervention-a.fsh
@@ -20,13 +20,7 @@ Description: "Patient*innen mit CLL sollen in der Erstlinienbehandlung mit einer
   * definitionCanonical = Canonical(ErstlinieMitBCL2beiCLL)
   * code = $sct#432102000 "Administration of substance (procedure)"
 * action[drugAdministration][+]
-  * definitionCanonical = Canonical(ErstlinieMitAcalabrutinibBeiCLL)
-  * code = $sct#432102000 "Administration of substance (procedure)"
-* action[drugAdministration][+]
-  * definitionCanonical = Canonical(ErstlinieMitIbrutinibBeiCLL)
-  * code = $sct#432102000 "Administration of substance (procedure)"
-* action[drugAdministration][+]
-  * definitionCanonical = Canonical(ErstlinieMitZanubrutinibBeiCLL)
+  * definitionCanonical = Canonical(ErstlinieMitBTKbeiCLL)
   * code = $sct#432102000 "Administration of substance (procedure)"
 
 /**********************/
@@ -44,51 +38,16 @@ Description: "Erstlinienterapie mit BCL2-Inhibitor bei CLL"
 * code = $sct#432102000 "Administration of substance (procedure)"
 * productCodeableConcept
   * coding[sct] = $sct#725567006 "B-cell lymphoma 2 inhibitor"
- /* dosage[+] // TODO ggf. später mit Fachinfo/Packungsbeilage ergänzen 
-  * route = $sct#34206005 "Subcutaneous route (qualifier value)"
-  * timing //nicht definiert in dieser Leitlinie
-    * repeat
-      * frequency = 1
-      * period = 1
-      * periodUnit = $ucum#d "day"
-  * doseAndRate //nicht definiert in dieser Leitlinie
-    * doseQuantity = 200 '[iU]/kg' "IU/kg"*/
-
-Instance: ErstlinieMitAcalabrutinibBeiCLL
-InstanceOf: drug-administration-action
-Usage: #definition
-Title: "Erstlinienterapie mit Acalabrutinib bei CLL"
-Description: "Erstlinienterapie mit Acalabrutinib bei CLL"
-* name = "ErstlinieMitAcalabrutinibBeiCLL"
-* insert publisher-experimental-version
-* status = #active
-* description = "Erstlinienterapie mit Acalabrutinib bei CLL"
-* code = $sct#432102000 "Administration of substance (procedure)"
-* productCodeableConcept
-  * coding[sct] = $sct#763037006 "Acalabrutinib"
-
-Instance: ErstlinieMitIbrutinibBeiCLL
-InstanceOf: drug-administration-action
-Usage: #definition
-Title: "Erstlinienterapie mit Ibrutinib bei CLL"
-Description: "Erstlinienterapie mit Ibrutinib bei CLL"
-* name = "ErstlinieMitIbrutinibBeiCLL"
-* insert publisher-experimental-version
-* status = #active
-* description = "Erstlinienterapie mit Ibrutinib bei CLL"
-* code = $sct#432102000 "Administration of substance (procedure)"
-* productCodeableConcept
-  * coding[sct] = $sct#710228002 "Ibrutinib"
 
-Instance: ErstlinieMitZanubrutinibBeiCLL
+Instance: ErstlinieMitBTKbeiCLL
 InstanceOf: drug-administration-action
 Usage: #definition
-Title: "Erstlinienterapie mit Zanubrutinib bei CLL"
-Description: "Erstlinienterapie mit Zanubrutinib bei CLL"
-* name = "ErstlinieMitZanubrutinibBeiCLL"
+Title: "Rezidivtherapie mit BTK-Inhibitor bei CLL"
+Description: "Rezidivtherapie mit BTK-Inhibitor bei CLL"
+* name = "RezidivtherapieMitBTKbeiCLL"
 * insert publisher-experimental-version
 * status = #active
-* description = "Erstlinienterapie mit Zanubrutinib bei CLL"
+* description = "Rezidivtherapie mit BTK-Inhibitor bei CLL"
 * code = $sct#432102000 "Administration of substance (procedure)"
 * productCodeableConcept
-  * coding[sct] = $sct#830162004 "Zanubrutinib"
+  * coding[sct] = $sct#710227007 "Non-specific protein-tyrosine kinase inhibitor"
diff --git a/input/fsh/CLL/recommendation-CLL-5-4/Intervention-a.fsh b/input/fsh/CLL/recommendation-CLL-5-4/Intervention-a.fsh
index c18265b..4dac8a5 100644
--- a/input/fsh/CLL/recommendation-CLL-5-4/Intervention-a.fsh
+++ b/input/fsh/CLL/recommendation-CLL-5-4/Intervention-a.fsh
@@ -17,78 +17,38 @@ Description: "Als Rezidivtherapie sollen die zeitlich begrenzte, Venetoclax- bas
 * extension[partOf].valueCanonical = Canonical(RecCollectionRezidivtherapieBCL2undBTKbeiCLL)
 * insert rs-combination-exactly(1)
 * action[drugAdministration][+]
-  * definitionCanonical = Canonical(RezidivtherapieMitVenetoclaxBeiCLL)
+  * definitionCanonical = Canonical(RezidivtherapieMitBCL2beiCLL)
   * code = $sct#432102000 "Administration of substance (procedure)"
 * action[drugAdministration][+]
-  * definitionCanonical = Canonical(RezidivtherapieMitAcalabrutinibBeiCLL)
-  * code = $sct#432102000 "Administration of substance (procedure)"
-* action[drugAdministration][+]
-  * definitionCanonical = Canonical(RezidivtherapieMitIbrutinibBeiCLL)
-  * code = $sct#432102000 "Administration of substance (procedure)"
-* action[drugAdministration][+]
-  * definitionCanonical = Canonical(RezidivtherapieMitZanubrutinibBeiCLL)
+  * definitionCanonical = Canonical(RezidivtherapieMitBTKbeiCLL)
   * code = $sct#432102000 "Administration of substance (procedure)"
 
 /**********************/
 /* Recommended Actions */
 /**********************/
-Instance: RezidivtherapieMitVenetoclaxBeiCLL
-InstanceOf: drug-administration-action
-Usage: #definition
-Title: "Rezidivtherapie mit Venetoclax bei CLL"
-Description: "Rezidivtherapie mit Venetoclax bei CLL"
-* name = "RezidivtherapieMitVenetoclaxBeiCLL"
-* insert publisher-experimental-version
-* status = #active
-* description = "Rezidivtherapie mit Venetoclax bei CLL"
-* code = $sct#432102000 "Administration of substance (procedure)"
-* productCodeableConcept
-  * coding[sct] = $sct#720491001 "Venetoclax"
- /* dosage[+]
-  * route = $sct#34206005 "Subcutaneous route (qualifier value)"
-  * timing //nicht definiert in dieser Leitlinie
-    * repeat
-      * frequency = 1
-      * period = 1
-      * periodUnit = $ucum#d "day"
-  * doseAndRate //nicht definiert in dieser Leitlinie
-    * doseQuantity = 200 '[iU]/kg' "IU/kg"*/
-
-Instance: RezidivtherapieMitAcalabrutinibBeiCLL
-InstanceOf: drug-administration-action
-Usage: #definition
-Title: "Rezidivtherapie mit Acalabrutinib bei CLL"
-Description: "Rezidivtherapieterapie mit Acalabrutinib bei CLL"
-* name = "RezidivtherapieMitAcalabrutinibBeiCLL"
-* insert publisher-experimental-version
-* status = #active
-* description = "Rezidivtherapieterapie mit Acalabrutinib bei CLL"
-* code = $sct#432102000 "Administration of substance (procedure)"
-* productCodeableConcept
-  * coding[sct] = $sct#763037006 "Acalabrutinib"
 
-Instance: RezidivtherapieMitIbrutinibBeiCLL
+Instance: RezidivtherapieMitBCL2beiCLL
 InstanceOf: drug-administration-action
 Usage: #definition
-Title: "Rezidivtherapie mit Ibrutinib bei CLL"
-Description: "Rezidivtherapie mit Ibrutinib bei CLL"
-* name = "ErstlinieMitIbrutinibBeiCLL"
+Title: "Erstlinienterapie mit BCL2-Inhibitor bei CLL"
+Description: "Erstlinienterapie mit BCL2-Inhibitor bei CLL"
+* name = "ErstlinieMitBCL2beiCLL"
 * insert publisher-experimental-version
 * status = #active
-* description = "Rezidivtherapie mit Ibrutinib bei CLL"
+* description = "Erstlinienterapie mit BCL2-Inhibitor bei CLL"
 * code = $sct#432102000 "Administration of substance (procedure)"
 * productCodeableConcept
-  * coding[sct] = $sct#710228002 "Ibrutinib"
+  * coding[sct] = $sct#725567006 "B-cell lymphoma 2 inhibitor"
 
-Instance: RezidivtherapieMitZanubrutinibBeiCLL
+Instance: RezidivtherapieMitBTKbeiCLL
 InstanceOf: drug-administration-action
 Usage: #definition
-Title: "Rezidivtherapie mit Zanubrutinib bei CLL"
-Description: "Rezidivtherapie mit Zanubrutinib bei CLL"
-* name = "ErstlinieMitZanubrutinibBeiCLL"
+Title: "Rezidivtherapie mit BTK-Inhibitor bei CLL"
+Description: "Rezidivtherapie mit BTK-Inhibitor bei CLL"
+* name = "RezidivtherapieMitBTKbeiCLL"
 * insert publisher-experimental-version
 * status = #active
-* description = "Rezidivtherapie mit Zanubrutinib bei CLL"
+* description = "Rezidivtherapie mit BTK-Inhibitor bei CLL"
 * code = $sct#432102000 "Administration of substance (procedure)"
 * productCodeableConcept
-  * coding[sct] = $sct#830162004 "Zanubrutinib"
\ No newline at end of file
+  * coding[sct] = $sct#710227007 "Non-specific protein-tyrosine kinase inhibitor"
\ No newline at end of file
diff --git a/input/fsh/CLL/recommendation-CLL-5-4/population-a.fsh b/input/fsh/CLL/recommendation-CLL-5-4/population-a.fsh
index e7b2e33..5b5e246 100644
--- a/input/fsh/CLL/recommendation-CLL-5-4/population-a.fsh
+++ b/input/fsh/CLL/recommendation-CLL-5-4/population-a.fsh
@@ -18,13 +18,8 @@ Description: "Population, die eine Chronisch Lymphatische Leukämie hat und eine
     * definitionByTypeAndValue
       * type  = $sct#404684003 "Clinical finding (finding)"
       * valueCodeableConcept = $sct#92814006 "Chronic lymphoid leukaemia, disease"
-  * characteristic[condition][+] 
-    * linkId = "CLL"
-    * definitionByTypeAndValue
-      * type  = $sct#404684003 "Clinical finding (finding)"
-      * valueCodeableConcept = $sct#123781000119107 "Chronic leukemia in relapse"
   * characteristic[procedure][+]
     * linkId = "CLL"
     * definitionByTypeAndValue
       * type = $sct#71388002 "Procedure (procedure)"
-      * valueCodeableConcept = $sct#708255002 "First line treatment"
\ No newline at end of file
+      * valueCodeableConcept = $cs-cll#cllrete "CLL Relapse therapy"
\ No newline at end of file
diff --git a/input/fsh/cs-celida.fsh b/input/fsh/cs-celida.fsh
deleted file mode 100644
index 1777711..0000000
--- a/input/fsh/cs-celida.fsh
+++ /dev/null
@@ -1,9 +0,0 @@
-// the use of an alias is a workaround for an error otherwise thrown in sushi 3.0.0
-Alias: $cs-celida = https://www.netzwerk-universitaetsmedizin.de/fhir/codex-celida/CodeSystem/codex-celida
-
-CodeSystem: CODEX_CELIDA
-Id: codex-celida
-Title: "CODEX-CELIDA"
-Description: "Concepts required in recommendations that are not defined elsewhere"
-* ^url = $cs-celida
-* #tvpibw "Tidal volume / ideal body weight (ARDSnet)" "Tidal volume per ideal body weight according to ARDSnet formula"
diff --git a/input/fsh/cs-cll.fsh b/input/fsh/cs-cll.fsh
new file mode 100644
index 0000000..75653da
--- /dev/null
+++ b/input/fsh/cs-cll.fsh
@@ -0,0 +1,14 @@
+// the use of an alias is a workaround for an error otherwise thrown in sushi 3.0.0
+Alias: $cs-cll = https://www.netzwerk-universitaetsmedizin.de/fhir/codex-celida/CodeSystem/codex-celida //TODO - welche Adresse?
+
+CodeSystem: CLL_V2
+Id: cll-v2
+Title: "CLL_V2"
+Description: "Concepts required in recommendations that are not defined elsewhere"
+* ^url = $cs-cll
+* #dprnt    "Disease progression that requires adapted or new treatment"
+* #dprnti   "Disease progression that requires adapted or new treatment with idelalisib" 
+* #scllt    "Systemic CLL therapy"
+* #porecotr "Poor response to corticosteroid treatment"
+* #sycasp   "Symptom-causing splenomegaly"
+* #cllrete  "CLL Relapse therapy"
\ No newline at end of file
diff --git a/input/fsh/rs-timingCLL.fsh b/input/fsh/rs-timingCLL.fsh
new file mode 100644
index 0000000..1f2128a
--- /dev/null
+++ b/input/fsh/rs-timingCLL.fsh
@@ -0,0 +1,5 @@
+// Author: Viktor Bublitz @bublitzv
+RuleSet: rs-timingCLL(count,period)
+* timingTiming.repeat.count = {count} //TODO ich hab das hier als Vorschlag, wenn inordnung: bei allen assessment actions umsetzen  :)
+* timingTiming.repeat.period = {period}
+* timingTiming.repeat.periodUnit = $ucum#wk "week" 
\ No newline at end of file