diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7afcfdf..254780f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 	OpenSeizureDetector Android App - Change Log
 	============================================
-	V3.5.0 - Aug 2020 Added broadcast to request phone call dial alert (handled by separate app OpenSeizureDetector Dialler).
+	V3.5.0 - Aug 2020
+	     - Added broadcast to request phone call dial alert (handled by separate app OpenSeizureDetector Dialler).
+	     - Added UUID string to SMS alerts so they can be detected by a custom SMS receiver on the carer's phone.
 
 	V3.2.1 - Aug2020
 		- Addition of Spanish Translation, and correction of crash report wording in German.
diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index a4765ad..7853363 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -645,7 +645,7 @@ public class MainActivity extends AppCompatActivity {
             if (mConnection.mBound) {
                 if ((mConnection.mSdServer.mSmsTimer != null)
                         && (mConnection.mSdServer.mSmsTimer.mTimeLeft > 0)) {
-                    acceptAlarmButton.setText(getString(R.string.SMSWillBeSentIn) +
+                    acceptAlarmButton.setText(getString(R.string.SMSWillBeSentIn) + " " +
                             mConnection.mSdServer.mSmsTimer.mTimeLeft / 1000 +
                             " s - "+getString(R.string.Cancel));
                     acceptAlarmButton.setBackgroundColor(alarmColour);
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index 209662b..c5ddbde 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -82,6 +82,8 @@ import uk.org.openseizuredetector.LogManager;
  * http://developer.android.com/guide/components/services.html#ExtendingService
  */
 public class SdServer extends Service implements SdDataReceiver {
+    private String mUuidStr = "0f675b21-5a36-4fe7-9761-fd0c691651f3";  // UUID to Identify OSD.
+
     // Notification ID
     private int NOTIFICATION_ID = 1;
     private String mNotChId = "OSD Notification Channel";
@@ -1213,10 +1215,12 @@ public class SdServer extends Service implements SdDataReceiver {
             Time tnow = new Time(Time.getCurrentTimezone());
             tnow.setToNow();
             String dateStr = tnow.format("%H:%M:%S %d/%m/%Y");
+            String shortUuidStr = mUuidStr.substring(mUuidStr.length()-6);
+
             // SmsManager sm = SmsManager.getDefault();
             for (int i = 0; i < mSMSNumbers.length; i++) {
                 Log.i(TAG, "SmsTimer.onFinish() - Sending to " + mSMSNumbers[i]);
-                sendSMS(new String(mSMSNumbers[i]), mSMSMsgStr + " - " + dateStr);
+                sendSMS(new String(mSMSNumbers[i]), mSMSMsgStr + " - " + dateStr + " " + shortUuidStr);
             }
         }
 
@@ -1284,8 +1288,10 @@ public class SdServer extends Service implements SdDataReceiver {
                             + ";u=" + df.format(ll.getAccuracy()) + "'>here</a>";
                     String googleUrl = "https://www.google.com/maps/place?q="
                             + ll.getLatitude() + "%2C" + ll.getLongitude();
+                    String shortUuidStr = mUuidStr.substring(mUuidStr.length()-6);
+
                     String messageStr = mSMSMsgStr + " - " +
-                            dateStr + " - " + googleUrl;
+                            dateStr + " - " + googleUrl + " " + shortUuidStr;
                     Log.i(TAG, "onSdLocationReceived() - Message is " + messageStr);
                     mUtil.showToast(messageStr);
                     for (int i = 0; i < mSMSNumbers.length; i++) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9088d8d..410e066 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_name">OpenSeizureDetector</string>
     <string name="changelog">
         \n V3.5 - Added support for Phone Call Alerts, using separate OpenSeizureDetector Dialler App
+        \n      - Added Unique Identifier (UUID) to SMS alerts so they can be detected as OpenSeizureDetector SMS messages on client phone.
     </string>
     <string name="UpgradeMsg">
         OpenSeizureDetector does not collect any personal data.
diff --git a/build.gradle b/build.gradle
index c09d3bd..ba0e56c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
     }
 }
 allprojects {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d686325..9e4548a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Feb 24 20:46:57 GMT 2020
+#Fri Aug 21 22:56:16 BST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip