diff --git a/RADAR-MAAM-QMUL-s1/protocol.json b/RADAR-MAAM-QMUL-s1/protocol.json
index 6dae3b26..6d8c7d3a 100644
--- a/RADAR-MAAM-QMUL-s1/protocol.json
+++ b/RADAR-MAAM-QMUL-s1/protocol.json
@@ -1,18 +1,18 @@
 {
-  "version": "0.0.6",
+  "version": "0.0.7",
   "schemaVersion": "0.0.1",
   "name": "RADAR MAAM QMUL s1",
   "healthIssues": ["ADHD", "menstrual", "menopause"],
   "protocols": [
     {
-      "name": "Your Mood",
+      "name": "Day B Questionnaires",
       "showIntroduction": true,
       "showInCalendar": true,
       "isDemo": false,
       "order": 4,
       "questionnaire": {
         "repository": "https://raw.githubusercontent.com/RADAR-CNS/RADAR-REDCap-aRMT-Definitions/master/questionnaires/",
-        "name": "maam_phq8",
+        "name": "maam_day_b",
         "avsc": "questionnaire"
       },
       "startText": {
@@ -48,37 +48,37 @@
         "repeatQuestionnaire": {
           "unit": "min",
           "unitsFromZero": [
-            2580
+            2460
           ]
         },
         "reminders": {
           "unit": "hour",
-          "amount": 1,
+          "amount": 3,
           "repeat": 1
         },
         "completionWindow": {
           "unit": "hour",
-          "amount": 5
+          "amount": 7
         },
         "notification": {
           "title": {
             "en": "Questionnaire time"
           },
           "text": {
-            "en": "Please complete these questionnaires this evening reflecting on your day. You will also receive a reminder in an hour if you haven't completed them by then."
+            "en": "Please complete these questionnaires this evening reflecting on your day. You will also receive a reminder in 3 hours if you haven't completed them by then."
           }
         }
       }
     },
     {
-      "name": "Irritability",
+      "name": "Day A Questionnaires",
       "showIntroduction": true,
       "showInCalendar": true,
       "isDemo": false,
       "order": 4,
       "questionnaire": {
         "repository": "https://raw.githubusercontent.com/RADAR-CNS/RADAR-REDCap-aRMT-Definitions/master/questionnaires/",
-        "name": "maam_ari_self",
+        "name": "maam_day_a",
         "avsc": "questionnaire"
       },
       "startText": {
@@ -114,354 +114,24 @@
         "repeatQuestionnaire": {
           "unit": "min",
           "unitsFromZero": [
-            2580
+            1020
           ]
         },
         "reminders": {
           "unit": "hour",
-          "amount": 0,
-          "repeat": 0
-        },
-        "completionWindow": {
-          "unit": "hour",
-          "amount": 5
-        },
-        "notification": {
-          "title": {
-            "en": "Questionnaire time"
-          },
-          "text": {
-            "en": "Please complete these questionnaires this evening reflecting on your day. You will also receive a reminder in an hour if you haven't completed them by then."
-          }
-        }
-      }
-    },
-    {
-      "name": "Your Executive Functioning",
-      "showIntroduction": true,
-      "showInCalendar": true,
-      "isDemo": false,
-      "order": 4,
-      "questionnaire": {
-        "repository": "https://raw.githubusercontent.com/RADAR-CNS/RADAR-REDCap-aRMT-Definitions/master/questionnaires/",
-        "name": "neuro_qol",
-        "avsc": "questionnaire"
-      },
-      "startText": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "endText": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "warn": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "estimatedCompletionTime": 2,
-      "protocol": {
-        "repeatProtocol": {
-          "unit": "day",
-          "amount": 2
-        },
-        "repeatQuestionnaire": {
-          "unit": "min",
-          "unitsFromZero": [
-            2580
-          ]
-        },
-        "reminders": {
-          "unit": "hour",
-          "amount": 0,
-          "repeat": 0
-        },
-        "completionWindow": {
-          "unit": "hour",
-          "amount": 5
-        },
-        "notification": {
-          "title": {
-            "en": "Questionnaire time"
-          },
-          "text": {
-            "en": "Please complete these questionnaires this evening reflecting on your day. You will also receive a reminder in an hour if you haven't completed them by then."
-          }
-        }
-      }
-    },
-    {
-      "name": "Your Sensory Sensitivity",
-      "showIntroduction": true,
-      "showInCalendar": true,
-      "isDemo": false,
-      "order": 4,
-      "questionnaire": {
-        "repository": "https://raw.githubusercontent.com/RADAR-CNS/RADAR-REDCap-aRMT-Definitions/master/questionnaires/",
-        "name": "sensitivity",
-        "avsc": "questionnaire"
-      },
-      "startText": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "endText": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "warn": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "estimatedCompletionTime": 2,
-      "protocol": {
-        "repeatProtocol": {
-          "unit": "day",
-          "amount": 2
-        },
-        "repeatQuestionnaire": {
-          "unit": "min",
-          "unitsFromZero": [
-            2580
-          ]
-        },
-        "reminders": {
-          "unit": "hour",
-          "amount": 0,
-          "repeat": 0
-        },
-        "completionWindow": {
-          "unit": "hour",
-          "amount": 5
-        },
-        "notification": {
-          "title": {
-            "en": "Questionnaire time"
-          },
-          "text": {
-            "en": "Please complete these questionnaires this evening reflecting on your day. You will also receive a reminder in an hour if you haven't completed them by then."
-          }
-        }
-      }
-    },
-    {
-      "name": "ADHD Medication Use",
-      "showIntroduction": true,
-      "showInCalendar": true,
-      "isDemo": false,
-      "order": 4,
-      "questionnaire": {
-        "repository": "https://raw.githubusercontent.com/RADAR-CNS/RADAR-REDCap-aRMT-Definitions/master/questionnaires/",
-        "name": "adhd_medication_use_maam",
-        "avsc": "questionnaire"
-      },
-      "startText": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "endText": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "warn": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "estimatedCompletionTime": 2,
-      "protocol": {
-        "repeatProtocol": {
-          "unit": "day",
-          "amount": 1
-        },
-        "repeatQuestionnaire": {
-          "unit": "min",
-          "unitsFromZero": [
-            1140
-          ]
-        },
-        "reminders": {
-          "unit": "hour",
-          "amount": 0,
-          "repeat": 0
-        },
-        "completionWindow": {
-          "unit": "hour",
-          "amount": 5
-        },
-        "notification": {
-          "title": {
-            "en": "Questionnaire time"
-          },
-          "text": {
-            "en": "Please complete these questionnaires this evening reflecting on your day. You will also receive a reminder in an hour if you haven't completed them by then."
-          }
-        }
-      }
-    },
-    {
-      "name": "Your Cycle And Physical Symptoms",
-      "showIntroduction": true,
-      "showInCalendar": true,
-      "isDemo": false,
-      "order": 4,
-      "questionnaire": {
-        "repository": "https://raw.githubusercontent.com/RADAR-CNS/RADAR-REDCap-aRMT-Definitions/master/questionnaires/",
-        "name": "period_pain_and_fatigue",
-        "avsc": "questionnaire"
-      },
-      "startText": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "endText": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "warn": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "estimatedCompletionTime": 2,
-      "protocol": {
-        "repeatProtocol": {
-          "unit": "day",
-          "amount": 1
-        },
-        "repeatQuestionnaire": {
-          "unit": "min",
-          "unitsFromZero": [
-            1140
-          ]
-        },
-        "reminders": {
-          "unit": "hour",
-          "amount": 0,
-          "repeat": 0
-        },
-        "completionWindow": {
-          "unit": "hour",
-          "amount": 5
-        },
-        "notification": {
-          "title": {
-            "en": "Questionnaire time"
-          },
-          "text": {
-            "en": "Please complete these questionnaires this evening reflecting on your day. You will also receive a reminder in an hour if you haven't completed them by then."
-          }
-        }
-      }
-    },
-    {
-      "name": "ADHD Symptoms And Impairment",
-      "showIntroduction": true,
-      "showInCalendar": true,
-      "isDemo": false,
-      "order": 4,
-      "questionnaire": {
-        "repository": "https://raw.githubusercontent.com/RADAR-CNS/RADAR-REDCap-aRMT-Definitions/master/questionnaires/",
-        "name": "adhd_symptoms_and_impairment",
-        "avsc": "questionnaire"
-      },
-      "startText": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "endText": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "warn": {
-        "en": "",
-        "it": "",
-        "nl": "",
-        "da": "",
-        "de": "",
-        "es": ""
-      },
-      "estimatedCompletionTime": 2,
-      "protocol": {
-        "repeatProtocol": {
-          "unit": "day",
-          "amount": 2
-        },
-        "repeatQuestionnaire": {
-          "unit": "min",
-          "unitsFromZero": [
-            1140
-          ]
-        },
-        "reminders": {
-          "unit": "hour",
-          "amount": 0,
-          "repeat": 0
+          "amount": 3,
+          "repeat": 1
         },
         "completionWindow": {
           "unit": "hour",
-          "amount": 5
+          "amount": 7
         },
         "notification": {
           "title": {
             "en": "Questionnaire time"
           },
           "text": {
-            "en": "Please complete these questionnaires this evening reflecting on your day. You will also receive a reminder in an hour if you haven't completed them by then."
+            "en": "Please complete these questionnaires this evening reflecting on your day. You will also receive a reminder in 3 hours if you haven't completed them by then."
           }
         }
       }