diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 29be743..7abab4c 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b0c7b20..e0d5b93 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -29,7 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index 5b09048..a00ece7 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 0d530ea..41524b3 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
index 1e55562..60cd32a 100644
--- a/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/MatchActivity.kt
@@ -30,7 +30,7 @@ class MatchActivity : AppCompatActivity() {
 
     inner class SttAfterTts : UtteranceProgressListener() {
         override fun onDone(id: String) {
-            SttDialog().show( supportFragmentManager, "SttDialog")
+            SttDialog().show(supportFragmentManager, "SttDialog")
         }
 
         override fun onStart(id: String) {}
@@ -69,7 +69,10 @@ class MatchActivity : AppCompatActivity() {
                     sttEnabled = getBooleanExtra("enableSTT", false)
                     saveState()
 
-                    if (ttsEnabled) tts = TextToSpeech(this@MatchActivity, WaitForTtsInit())
+                    if (ttsEnabled) {
+                        tts = TextToSpeech(this@MatchActivity, WaitForTtsInit())
+                        if (sttEnabled) tts?.setOnUtteranceProgressListener(SttAfterTts())
+                    }
                     if (!sttEnabled) showPopUp(getString(R.string.button_hint))
                 }
             }
@@ -127,10 +130,7 @@ class MatchActivity : AppCompatActivity() {
                     if (matchPoint) scoreSpeech += getString(R.string.match_point)
                     say(scoreSpeech)
                 }
-                if (sttEnabled) {
-                    if (ttsEnabled) tts?.setOnUtteranceProgressListener(SttAfterTts())
-                    else SttDialog().show(supportFragmentManager, "SttDialog")
-                }
+                if (sttEnabled and !ttsEnabled) SttDialog().show(supportFragmentManager, "SttDialog")
             }
         }
     }
diff --git a/app/src/main/java/adrienmalin/pingpoints/Player.kt b/app/src/main/java/adrienmalin/pingpoints/Player.kt
index 2544731..170f33d 100644
--- a/app/src/main/java/adrienmalin/pingpoints/Player.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/Player.kt
@@ -1,9 +1,7 @@
 package adrienmalin.pingpoints
 
-import java.util.regex.Pattern
-
 data class Player (
     var name: String,
     var score: Int,
-    var pattern: Pattern? = null
+    var soundex:String? = null
 )
\ No newline at end of file
diff --git a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
index 0cfa21f..7695bca 100644
--- a/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
+++ b/app/src/main/java/adrienmalin/pingpoints/SttDialog.kt
@@ -99,10 +99,11 @@ class SttDialog : DialogFragment() {
                         players[1].name
                     )
                     sttIntent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH).apply {
-                        putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
+                        putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_WEB_SEARCH)
                         putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, 10)
                         putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS, true)
                         putExtra(RecognizerIntent.EXTRA_PREFER_OFFLINE, true)
+                        putExtra(RecognizerIntent.EXTRA_SPEECH_INPUT_COMPLETE_SILENCE_LENGTH_MILLIS, 30000)
                     }
                     stt = SpeechRecognizer.createSpeechRecognizer(activity).apply {
                         setRecognitionListener(SttListener())
diff --git a/app/src/main/java/adrienmalin/pingpoints/Html.kt b/app/src/main/java/adrienmalin/pingpoints/html.kt
similarity index 100%
rename from app/src/main/java/adrienmalin/pingpoints/Html.kt
rename to app/src/main/java/adrienmalin/pingpoints/html.kt