diff --git a/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt b/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
index fc7391c..4932b68 100644
--- a/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
+++ b/app/src/main/java/com/example/countdowntimer/CountdownDialog.kt
@@ -61,14 +61,10 @@ class CountdownDialog(
                 val progress = millisUntilFinished.toFloat() / durationMillis
                 cvCountdown.setProgress(progress)
 
-                if (millisUntilFinished >= durationMillis) {
-                    cvCountdown.setText(context.getString(R.string.countdown_text))
-                } else {
-                    val secondsLeft = (millisUntilFinished / 1000).toInt() + 1
-                    cvCountdown.setText(secondsLeft.toString())
-                }
+                val secondsLeft = (millisUntilFinished / 1000).toInt() + 1
+                cvCountdown.setText(secondsLeft.toString())
 
-                if (millisUntilFinished <= 3000 && millisUntilFinished > 1000) {
+                if (secondsLeft >= 1 && secondsLeft <= 3) {
                     playTone(ToneGenerator.TONE_PROP_BEEP)
                     if (prefs.getBoolean("vibration", true)) {
                         vibrator?.vibrate(50)