diff --git a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/AppComponent.java b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/AppComponent.java
index 08da64bf..2af540d3 100644
--- a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/AppComponent.java
+++ b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/AppComponent.java
@@ -13,6 +13,7 @@
 import javax.inject.Singleton;
 import pg.autyzm.friendly_plans.asset.AssetsHelper;
 import pg.autyzm.friendly_plans.asset.AssetsHelperModule;
+import pg.autyzm.friendly_plans.child_app.utility.SoundHelper;
 import pg.autyzm.friendly_plans.child_app.view.MainActivity;
 import pg.autyzm.friendly_plans.file_picker.FilePickerModule;
 import pg.autyzm.friendly_plans.file_picker.FilePickerProxy;
@@ -118,4 +119,6 @@ public interface AppComponent {
     void inject(pg.autyzm.friendly_plans.child_app.view.step_slides.StepSlidesActivity stepSlidesActivity);
 
     void inject(pg.autyzm.friendly_plans.child_app.view.task_slides.TaskSlidesActivity taskSlidesActivity);
+
+    void inject(SoundHelper soundHelper);
 }
diff --git a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/utility/SoundHelper.java b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/utility/SoundHelper.java
new file mode 100644
index 00000000..5f1c1294
--- /dev/null
+++ b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/utility/SoundHelper.java
@@ -0,0 +1,61 @@
+package pg.autyzm.friendly_plans.child_app.utility;
+
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+
+import java.io.IOException;
+
+import javax.inject.Inject;
+
+import database.repository.AssetRepository;
+import database.repository.ChildPlanRepository;
+import pg.autyzm.friendly_plans.AppComponent;
+import pg.autyzm.friendly_plans.asset.AssetsHelper;
+
+public class SoundHelper {
+    @Inject
+    ChildPlanRepository childPlanRepository;
+    @Inject
+    AssetsHelper assetsHelper;
+    @Inject
+    AssetRepository assetRepository;
+    String loopSoundPath;
+    public static SoundHelper getSoundHelper(AppComponent appComponent)
+    {
+        SoundHelper soundHelper = new SoundHelper();
+        appComponent.inject(soundHelper);
+        soundHelper.setLoopSoundPath();
+        return soundHelper;
+    }
+
+    void setLoopSoundPath() {
+        Long soundId = childPlanRepository.getActivePlan().getChild().getTimerSoundId();
+        loopSoundPath = assetsHelper.getFileFullPath(assetRepository.get(soundId));
+
+    }
+
+    public MediaPlayer prepareLoopSound() {
+        MediaPlayer sound = new MediaPlayer();
+        try {
+            sound.setDataSource(loopSoundPath);
+            sound.setAudioStreamType(AudioManager.STREAM_MUSIC);
+            sound.setLooping(true);
+            sound.prepare();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return sound;
+    }
+
+    public void resetLoopSound(MediaPlayer sound){
+        sound.reset();
+        try {
+            sound.setDataSource(loopSoundPath);
+            sound.setAudioStreamType(AudioManager.STREAM_MUSIC);
+            sound.setLooping(true);
+            sound.prepare();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/step_list/StepListActivity.java b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/step_list/StepListActivity.java
index 18719c42..32d79b1f 100644
--- a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/step_list/StepListActivity.java
+++ b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/step_list/StepListActivity.java
@@ -1,6 +1,7 @@
 package pg.autyzm.friendly_plans.child_app.view.step_list;
 
 import android.content.Intent;
+import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
@@ -20,6 +21,7 @@
 import pg.autyzm.friendly_plans.child_app.utility.ChildActivityExecutor;
 import pg.autyzm.friendly_plans.child_app.utility.Consts;
 import pg.autyzm.friendly_plans.child_app.utility.ChildActivityState;
+import pg.autyzm.friendly_plans.child_app.utility.SoundHelper;
 
 public class StepListActivity extends AppCompatActivity {
 
@@ -42,6 +44,10 @@ void setRecyclerView() {
                 getIntent().getExtras().getLong(ActivityProperties.TASK_ID)
         );
         String filesDirectory = getApplicationContext().getFilesDir().toString();
+        MediaPlayer startSound = MediaPlayer.create(this, R.raw.beep);
+        MediaPlayer endSound = SoundHelper.getSoundHelper(((App) getApplication()).getAppComponent()).prepareLoopSound();
+        stepListener.setStartSound(startSound);
+        stepListener.setEndSound(endSound);
         stepRecyclerViewAdapter = new StepRecyclerViewAdapter(steps, filesDirectory, stepListener);
 
         RecyclerView recyclerView = (RecyclerView) findViewById(R.id.rv_child_app_step_list);
@@ -53,6 +59,9 @@ void setRecyclerView() {
 
 
     StepRecyclerViewAdapter.StepItemClickListener stepListener = new StepRecyclerViewAdapter.StepItemClickListener() {
+        MediaPlayer startSound;
+        MediaPlayer endSound;
+
         @Override
         public void selectStepListener(int clickPosition, final TextView durationLabel) {
             if (clickPosition != stepRecyclerViewAdapter.getCurrentStepPosition()
@@ -60,6 +69,8 @@ public void selectStepListener(int clickPosition, final TextView durationLabel)
                 return;
 
             if (stepRecyclerViewAdapter.getCurrentStepState() == ChildActivityState.FINISHED){
+                endSound.stop();
+                SoundHelper.getSoundHelper(((App) getApplication()).getAppComponent()).resetLoopSound(endSound);
                 if (clickPosition < stepRecyclerViewAdapter.getItemCount() - 1) {
                     stepRecyclerViewAdapter.setCurrentStep(clickPosition + 1);
                     return;
@@ -73,17 +84,26 @@ public void selectStepListener(int clickPosition, final TextView durationLabel)
             startChildActivityExecution(durationLabel);
         }
 
+        public void setStartSound(MediaPlayer sound) {
+            startSound = sound;
+        }
+
+        public void setEndSound(MediaPlayer sound) {
+            endSound = sound;
+        }
+
         private void startChildActivityExecution(final TextView durationLabel){
             stepRecyclerViewAdapter.setCurrentStepState(ChildActivityState.IN_PROGRESS);
             final Handler timerHandler = new Handler();
             String durationStr = durationLabel.getText().toString();
             Integer duration = Integer.parseInt(durationStr.replaceAll("[^0-9]", ""));
-
+            startSound.start();
             Runnable updater = new ChildActivityExecutor(duration, durationLabel, timerHandler,
                     new ChildActivityExecutor.ActivityCompletedListener(){
                         @Override
                         public void onActivityCompleted() {
                             stepRecyclerViewAdapter.activityCompleted();
+                            endSound.start();
                         }
                     });
 
diff --git a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/step_list/StepRecyclerViewAdapter.java b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/step_list/StepRecyclerViewAdapter.java
index 4aaf7d47..2bf0d0a9 100644
--- a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/step_list/StepRecyclerViewAdapter.java
+++ b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/step_list/StepRecyclerViewAdapter.java
@@ -2,6 +2,7 @@
 
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.media.MediaPlayer;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,6 +34,8 @@ public class StepRecyclerViewAdapter extends RecyclerView.Adapter<StepRecyclerVi
 
     protected interface StepItemClickListener {
         void selectStepListener(int position, TextView stepName);
+        void setStartSound(MediaPlayer sound);
+        void setEndSound(MediaPlayer sound);
     }
 
     static class StepRecyclerViewHolder extends RecyclerView.ViewHolder {
diff --git a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/step_slides/StepSlidesActivity.java b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/step_slides/StepSlidesActivity.java
index 57c8e052..5129900b 100644
--- a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/step_slides/StepSlidesActivity.java
+++ b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/step_slides/StepSlidesActivity.java
@@ -1,6 +1,7 @@
 package pg.autyzm.friendly_plans.child_app.view.step_slides;
 
 import android.content.Intent;
+import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
@@ -24,6 +25,7 @@
 import pg.autyzm.friendly_plans.child_app.utility.ChildActivityExecutor;
 import pg.autyzm.friendly_plans.child_app.utility.Consts;
 import pg.autyzm.friendly_plans.child_app.utility.ChildActivityState;
+import pg.autyzm.friendly_plans.child_app.utility.SoundHelper;
 
 import static android.view.View.VISIBLE;
 
@@ -43,6 +45,8 @@ public class StepSlidesActivity extends AppCompatActivity {
     ImageView stepTimerIcon;
     ImageButton backButton;
     ImageButton nextButton;
+    MediaPlayer startSound;
+    MediaPlayer endSound;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -55,10 +59,16 @@ protected void onCreate(Bundle savedInstanceState) {
         if (steps.isEmpty())
             finish();
 
+        setUpSounds();
         setUpView();
         setCurrentStep(0);
     }
 
+    private void setUpSounds(){
+        startSound = MediaPlayer.create(this, R.raw.beep);
+        endSound = SoundHelper.getSoundHelper(((App) getApplication()).getAppComponent()).prepareLoopSound();
+    }
+
     private void setCurrentStep(int index){
         currentStep = index;
         StepTemplate step = steps.get(index);
@@ -69,7 +79,6 @@ private void setCurrentStep(int index){
 
     private void setupStepView(StepTemplate step){
         stepName.setText(step.getName());
-
         Integer duration = step.getDuration();
         if(duration != null) {
             stepDuration.setText(String.format("%d %s", duration, Consts.DURATION_UNIT_SECONDS));
@@ -151,8 +160,11 @@ public void onClick(View v) {
         public void onClick(View v) {
             if (currentStepStatus == ChildActivityState.PENDING_START)
                 startChildActivityExecution(stepDuration);
-            else if(currentStepStatus == ChildActivityState.FINISHED)
+            else if(currentStepStatus == ChildActivityState.FINISHED) {
+                endSound.stop();
+                SoundHelper.getSoundHelper(((App) getApplication()).getAppComponent()).resetLoopSound(endSound);
                 displayNavigationControls(true);
+            }
         }
     };
 
@@ -179,12 +191,13 @@ private void startChildActivityExecution(final TextView durationLabel){
         final Handler timerHandler = new Handler();
         String durationStr = durationLabel.getText().toString();
         Integer duration = Integer.parseInt(durationStr.replaceAll("[^0-9]", ""));
-
+        startSound.start();
         Runnable updater = new ChildActivityExecutor(duration, durationLabel, timerHandler,
                 new ChildActivityExecutor.ActivityCompletedListener(){
                     @Override
                     public void onActivityCompleted() {
                         currentStepStatus = ChildActivityState.FINISHED;
+                        endSound.start();
                     }
                 });
 
diff --git a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/task_list/TaskListActivity.java b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/task_list/TaskListActivity.java
index 4b942437..a467aa53 100644
--- a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/task_list/TaskListActivity.java
+++ b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/task_list/TaskListActivity.java
@@ -1,6 +1,7 @@
 package pg.autyzm.friendly_plans.child_app.view.task_list;
 
 import android.content.Intent;
+import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
@@ -14,27 +15,36 @@
 
 import database.entities.ChildPlan;
 import database.entities.TaskTemplate;
+import database.repository.AssetRepository;
 import database.repository.ChildPlanRepository;
 import pg.autyzm.friendly_plans.App;
+import pg.autyzm.friendly_plans.AppComponent;
 import pg.autyzm.friendly_plans.R;
+import pg.autyzm.friendly_plans.asset.AssetsHelper;
 import pg.autyzm.friendly_plans.child_app.utility.ChildActivityExecutor;
 import pg.autyzm.friendly_plans.child_app.utility.Consts;
 import pg.autyzm.friendly_plans.child_app.utility.ChildActivityState;
+import pg.autyzm.friendly_plans.child_app.utility.SoundHelper;
 import pg.autyzm.friendly_plans.child_app.utility.StepsDisplayUtils;
 
 public class TaskListActivity extends AppCompatActivity {
     @Inject
     ChildPlanRepository childPlanRepository;
+    @Inject
+    AssetsHelper assetsHelper;
+    @Inject
+    AssetRepository assetRepository;
     private TaskRecyclerViewAdapter taskRecyclerViewAdapter;
 
     TaskRecyclerViewAdapter.TaskItemClickListener taskItemClickListener =
             new TaskRecyclerViewAdapter.TaskItemClickListener() {
-
+                MediaPlayer startSound;
+                MediaPlayer endSound;
+                AppComponent appComponent;
                 @Override
                 public void stepsIconListener(int position) {
                     if (position == taskRecyclerViewAdapter.getCurrentTaskPosition()
-                            && taskRecyclerViewAdapter.getCurrentTaskState() != ChildActivityState.IN_PROGRESS)
-                    {
+                            && taskRecyclerViewAdapter.getCurrentTaskState() != ChildActivityState.IN_PROGRESS) {
                         Intent intent = StepsDisplayUtils.getStepsDisplayIntent(
                                 TaskListActivity.this,
                                 taskRecyclerViewAdapter.getTaskItem(position).getId(),
@@ -50,7 +60,10 @@ public void timerIconClickListener(int clickPosition, final TextView durationLab
                             || taskRecyclerViewAdapter.getCurrentTaskState() == ChildActivityState.IN_PROGRESS)
                         return;
 
-                    if (taskRecyclerViewAdapter.getCurrentTaskState() == ChildActivityState.FINISHED){
+                    if (taskRecyclerViewAdapter.getCurrentTaskState() == ChildActivityState.FINISHED) {
+                        SoundHelper.getSoundHelper(((App) getApplication()).getAppComponent()).resetLoopSound(endSound);
+                        endSound.stop();
+                        SoundHelper.getSoundHelper(appComponent).resetLoopSound(endSound);
                         if (clickPosition < taskRecyclerViewAdapter.getItemCount() - 1) {
                             taskRecyclerViewAdapter.setCurrentTask(clickPosition + 1);
                             return;
@@ -71,17 +84,29 @@ public void blankChildActivityListener(int clickPosition) {
                     goToPlanFinishedScreen();
                 }
 
+                public void setStartSound(MediaPlayer sound) {
+                    startSound = sound;
+                }
+
+                public void setEndSound(MediaPlayer sound) {
+                    endSound = sound;
+                }
+
+                public void setAppComponent(AppComponent appComponent) {
+                    this.appComponent = appComponent;
+                }
+
                 private void startChildActivityExecution(final TextView durationLabel) {
                     taskRecyclerViewAdapter.setCurrentTaskState(ChildActivityState.IN_PROGRESS);
                     final Handler timerHandler = new Handler();
                     String durationStr = durationLabel.getText().toString();
                     Integer duration = Integer.parseInt(durationStr.replaceAll("[^0-9]", ""));
-
                     Runnable updater = new ChildActivityExecutor(duration, durationLabel, timerHandler,
-                            new ChildActivityExecutor.ActivityCompletedListener(){
+                            new ChildActivityExecutor.ActivityCompletedListener() {
                                 @Override
                                 public void onActivityCompleted() {
                                     taskRecyclerViewAdapter.activityCompleted();
+//                                    endSound.start();
                                 }
                             });
                     timerHandler.post(updater);
@@ -97,6 +122,12 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     void setRecyclerView() {
+        AppComponent appComponent = ((App) getApplication()).getAppComponent();
+        MediaPlayer startSound = MediaPlayer.create(this, R.raw.beep);
+        MediaPlayer endSound = SoundHelper.getSoundHelper(appComponent).prepareLoopSound();
+        taskItemClickListener.setStartSound(startSound);
+        taskItemClickListener.setEndSound(endSound);
+        taskItemClickListener.setAppComponent(appComponent);
         RecyclerView recyclerView = (RecyclerView) findViewById(R.id.rv_child_app_task_list);
         recyclerView.setHasFixedSize(true);
         RecyclerView.LayoutManager layoutManager = new LinearLayoutManager(this);
@@ -109,6 +140,8 @@ void setRecyclerView() {
         recyclerView.setAdapter(taskRecyclerViewAdapter);
     }
 
+
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data != null && data.getStringExtra(Consts.RETURN_MESSAGE_KEY) != null)
@@ -118,7 +151,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 goToPlanFinishedScreen();
     }
 
-    private void goToPlanFinishedScreen(){
+    private void goToPlanFinishedScreen() {
         Intent intentWithResult = new Intent();
         intentWithResult.putExtra(Consts.RETURN_MESSAGE_KEY, Consts.MESSAGE_TASKS_COMPLETED);
         setResult(Consts.RETURN_MESSAGE_CODE, intentWithResult);
@@ -126,7 +159,7 @@ private void goToPlanFinishedScreen(){
     }
 
     @Override
-    public void onBackPressed(){
+    public void onBackPressed() {
         Intent intentWithResult = new Intent();
         intentWithResult.putExtra(Consts.RETURN_MESSAGE_KEY, Consts.MESSAGE_TASKS_NOT_COMPLETED);
         setResult(Consts.RETURN_MESSAGE_CODE, intentWithResult);
diff --git a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/task_list/TaskRecyclerViewAdapter.java b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/task_list/TaskRecyclerViewAdapter.java
index 234e93e3..35f2a11a 100644
--- a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/task_list/TaskRecyclerViewAdapter.java
+++ b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/task_list/TaskRecyclerViewAdapter.java
@@ -2,6 +2,7 @@
 
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.media.MediaPlayer;
 import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -15,6 +16,7 @@
 import java.util.List;
 
 import database.entities.TaskTemplate;
+import pg.autyzm.friendly_plans.AppComponent;
 import pg.autyzm.friendly_plans.R;
 import pg.autyzm.friendly_plans.child_app.utility.Consts;
 import pg.autyzm.friendly_plans.child_app.view.common.ChildActivityList;
@@ -35,6 +37,9 @@ protected interface TaskItemClickListener {
         void stepsIconListener(int position);
         void timerIconClickListener(int position, final TextView durationLabel);
         void blankChildActivityListener(int position);
+        void setStartSound(MediaPlayer startSound);
+        void setEndSound(MediaPlayer startSound);
+        void setAppComponent(AppComponent appComponent);
     }
 
     static class TaskRecyclerViewHolder extends RecyclerView.ViewHolder {
diff --git a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/task_slides/TaskSlidesActivity.java b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/task_slides/TaskSlidesActivity.java
index 7b3d5901..fd573fc3 100644
--- a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/task_slides/TaskSlidesActivity.java
+++ b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/child_app/view/task_slides/TaskSlidesActivity.java
@@ -1,6 +1,7 @@
 package pg.autyzm.friendly_plans.child_app.view.task_slides;
 
 import android.content.Intent;
+import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
@@ -24,6 +25,7 @@
 import pg.autyzm.friendly_plans.child_app.utility.ChildActivityExecutor;
 import pg.autyzm.friendly_plans.child_app.utility.ChildActivityState;
 import pg.autyzm.friendly_plans.child_app.utility.Consts;
+import pg.autyzm.friendly_plans.child_app.utility.SoundHelper;
 import pg.autyzm.friendly_plans.child_app.utility.StepsDisplayUtils;
 
 import static android.view.View.VISIBLE;
@@ -44,6 +46,8 @@ public class TaskSlidesActivity extends AppCompatActivity {
     ImageView taskTimerIcon;
     ImageButton backButton;
     ImageButton nextButton;
+    MediaPlayer startSound;
+    MediaPlayer endSound;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -56,10 +60,16 @@ protected void onCreate(Bundle savedInstanceState) {
         if (tasks.isEmpty())
             finish();
 
+        setUpSounds();
         setUpView();
         setCurrentTask(0);
     }
 
+    private void setUpSounds(){
+        startSound = MediaPlayer.create(this, R.raw.beep);
+        endSound = SoundHelper.getSoundHelper(((App) getApplication()).getAppComponent()).prepareLoopSound();
+    }
+
     private void setCurrentTask(int index){
         currentTaskIndex = index;
         TaskTemplate task = tasks.get(index);
@@ -70,8 +80,6 @@ private void setCurrentTask(int index){
 
     private void setupTaskView(TaskTemplate task){
         taskName.setText(task.getName());
-
-
         Integer duration = task.getDurationTime();
         if(duration != null) {
             taskDuration.setText(String.format("%d %s", duration, Consts.DURATION_UNIT_SECONDS));
@@ -167,8 +175,11 @@ public void onClick(View v) {
         public void onClick(View v) {
             if (currentTaskStatus == ChildActivityState.PENDING_START)
                 startChildActivityExecution(taskDuration);
-            else if(currentTaskStatus == ChildActivityState.FINISHED)
+            else if(currentTaskStatus == ChildActivityState.FINISHED) {
                 displayNavigationControls(true);
+                endSound.stop();
+                SoundHelper.getSoundHelper(((App) getApplication()).getAppComponent()).resetLoopSound(endSound);
+            }
         }
     };
 
@@ -196,12 +207,13 @@ private void startChildActivityExecution(final TextView durationLabel){
         final Handler timerHandler = new Handler();
         String durationStr = durationLabel.getText().toString();
         Integer duration = Integer.parseInt(durationStr.replaceAll("[^0-9]", ""));
-
+        startSound.start();
         Runnable updater = new ChildActivityExecutor(duration, durationLabel, timerHandler,
                 new ChildActivityExecutor.ActivityCompletedListener(){
                     @Override
                     public void onActivityCompleted() {
                         currentTaskStatus = ChildActivityState.FINISHED;
+                        endSound.start();
                     }
                 });
 
diff --git a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/manager_app/view/components/SoundComponent.java b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/manager_app/view/components/SoundComponent.java
index 5ea0c155..c9544b6a 100644
--- a/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/manager_app/view/components/SoundComponent.java
+++ b/Friendly-plans/app/src/main/java/pg/autyzm/friendly_plans/manager_app/view/components/SoundComponent.java
@@ -30,7 +30,6 @@ public final class SoundComponent {
     @Inject
     AssetsHelper assetsHelper;
 
-
     private Long soundId;
     private ImageButton playSoundIcon;
     private Context context;
diff --git a/Friendly-plans/app/src/main/res/raw/beep.mp3 b/Friendly-plans/app/src/main/res/raw/beep.mp3
new file mode 100644
index 00000000..ebb528ae
Binary files /dev/null and b/Friendly-plans/app/src/main/res/raw/beep.mp3 differ