diff --git a/qa/api/qa.go b/qa/api/qa.go
index 54541f4a..da03ec14 100644
--- a/qa/api/qa.go
+++ b/qa/api/qa.go
@@ -109,6 +109,10 @@ func createExerciceQA(c *gin.Context) {
 			tmp := time.Now()
 			uq.Subject = "RAS"
 			uq.Solved = &tmp
+		} else if uq.State == "timer" {
+			tmp := time.Now()
+			uq.Subject = fmt.Sprintf("Temps passé équipe #%d (%s)", teamid, ficteam)
+			uq.Solved = &tmp
 		} else {
 			c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"errmsg": "Subject not filled"})
 			return
diff --git a/qa/ui/src/lib/components/QANewItem.svelte b/qa/ui/src/lib/components/QANewItem.svelte
index 4a4d6300..5ce4f0fd 100644
--- a/qa/ui/src/lib/components/QANewItem.svelte
+++ b/qa/ui/src/lib/components/QANewItem.svelte
@@ -19,12 +19,19 @@
  function saveQuery() {
      newQuery.id_exercice = exercice.id;
      creationInProgress = true;
+     const myContent = newQuery.content;
+     if (!newQuery.content) newQuery.content = "";
+     if (newQuery.difficulty)
+         newQuery.content = "Difficulté : " + newQuery.difficulty + "\n" + newQuery.content;
+     if (newQuery.timecount)
+         newQuery.content = "Temps passé : " + newQuery.timecount + "\n" + newQuery.content;
      newQuery.save().then((res) => {
          dispatch("new-query");
          newQuery = new QAQuery();
          creationInProgress = false;
      }).catch((err) => {
          creationInProgress = false;
+         newQuery.content = myContent;
          ToastsStore.addErrorToast({
              msg: err,
          })
@@ -49,18 +56,47 @@
                 </select>
             </div>
         </div>
-        <div class="mb-3 row">
-            <label for="subject" class="col-2 col-form-label col-form-label-sm">Sujet</label>
-            <div class="col-10">
-                <input
-                    type="text"
-                    class="form-control form-control-sm"
-                    id="subject"
-                    placeholder="Le pcap ne contient pas l'IP attendue"
-                    bind:value={newQuery.subject}
-                >
+        {#if newQuery.state == "timer"}
+            <div class="mb-3 row">
+                <label for="time-count" class="col-2 col-form-label col-form-label-sm">En combien de temps avez-vous résolu cet exercice&nbsp;?</label>
+                <div class="col-10">
+                    <input
+                        type="text"
+                        class="form-control form-control-sm"
+                        id="time-count"
+                        placeholder="10 minutes"
+                        bind:value={newQuery.timecount}
+                    >
+                </div>
             </div>
-        </div>
+            <div class="mb-3 row">
+                <label for="difficulty" class="col-2 col-form-label col-form-label-sm">Comment jaugez-vous la difficulté de cet exercice&nbsp;?</label>
+                <div class="col-10">
+	            <select class="form-select form-select-sm" id="difficulty" bind:value={newQuery.difficulty}>
+                        <option value="trop facile">Trop facile</option>
+                        <option value="facile">Facile</option>
+                        <option value="moyen">Moyen</option>
+                        <option value="difficile">Difficile</option>
+                        <option value="très difficile">Très difficile</option>
+                        <option value="trop difficile">Trop difficile</option>
+                        <option value="insane">Insane</option>
+                    </select>
+                </div>
+            </div>
+        {:else}
+            <div class="mb-3 row">
+                <label for="subject" class="col-2 col-form-label col-form-label-sm">Sujet</label>
+                <div class="col-10">
+                    <input
+                        type="text"
+                        class="form-control form-control-sm"
+                        id="subject"
+                        placeholder="Le pcap ne contient pas l'IP attendue"
+                        bind:value={newQuery.subject}
+                    >
+                </div>
+            </div>
+        {/if}
         <div class="mb-3 row">
             <label for="description" class="col-2 col-form-label col-form-label-sm">Description</label>
             <div class="col-10">
diff --git a/qa/ui/src/lib/qa.js b/qa/ui/src/lib/qa.js
index 17f8f2eb..58cf404d 100644
--- a/qa/ui/src/lib/qa.js
+++ b/qa/ui/src/lib/qa.js
@@ -1,5 +1,6 @@
 export const QAStates = {
   "ok": "OK",
+  "timer": "Temps passé",
   "orthograph": "Orthographe et grammaire",
   "issue-statement": "Pas compris",
   "issue-flag": "Problème de flag",