diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java
index 63beeb088192ef4ad9ea3015d9c57f1a10879b23..a3d0bded91f78d297adf18c87a5fc6d5503eaf66 100644
--- a/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java
+++ b/app/src/main/java/be/lepl1509group13/workoutwarrior/WorkoutActivity.java
@@ -100,11 +100,17 @@ public class WorkoutActivity extends AppCompatActivity {
 
     // Lauch custom program
     void onNextClickCustomProgram(String[][] exercises) {
+        /**
+         * For custom programs: when the button "Suivant" is pressed
+         */
         exerciseIndexToDisplay++;
-        System.out.println("index : " + exerciseIndexToDisplay);
-        System.out.println("len : " + exercises.length);
+
+        TextView countdown_text = findViewById(R.id.workout_timer);
+        countdown_text.setVisibility(View.INVISIBLE);
+
+        countdown.cancel();
+
         if (exerciseIndexToDisplay >= exercises.length) {
-            System.out.println("on finish");
             finish();
         } else {
             TextView name = findViewById(R.id.workout_todo);
@@ -160,6 +166,9 @@ public class WorkoutActivity extends AppCompatActivity {
     }
 
     void displayCustomExercise(String[][] exercises) {
+        /**
+         * For custom programs : display the exercise
+         */
         if (exerciseIndexToDisplay >= exercises.length) finish();
         next_btn.setOnClickListener(v1 -> onNextClickCustomProgram(exercises));
         TextView name = findViewById(R.id.workout_todo);
@@ -174,6 +183,23 @@ public class WorkoutActivity extends AppCompatActivity {
         int resourceId = getResources().getIdentifier(exercises[exerciseIndexToDisplay][2], "drawable", getPackageName());
         image.setImageResource(resourceId);
         image.setVisibility(View.VISIBLE);
+
+        timer = Integer.parseInt(exercises[exerciseIndexToDisplay][3]) * 1000;
+        System.out.println("timer = " + timer);
+
+        //Check if the user click on "start timer"
+        Button launch_timer = findViewById(R.id.launch_timer);
+        launch_timer.setVisibility(View.VISIBLE);
+        launch_timer.setOnClickListener(view -> {
+            TextView countdown_text = findViewById(R.id.workout_timer);
+            countdown_text.setVisibility(View.VISIBLE);
+            countdown = workout_timer(timer);
+            countdown.start();
+            launch_timer.setVisibility(View.INVISIBLE);
+            workout_timer_started = true;
+            workout_timer_counting = true;
+        });
+        timeLeftInMillis = timer;
     }