diff --git a/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java b/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java
index 27f4e0d..c175d40 100644
--- a/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java
+++ b/app/src/main/java/com/example/greenwatch/AccelerometerActivity.java
@@ -75,10 +75,10 @@ public class AccelerometerActivity extends AppCompatActivity implements SensorEv
             @Override
             public void onChanged(Boolean aBoolean) {
                 if (aBoolean) {
-                    mAccelerometerViewModel.setDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), mAccelerometerViewModel.getLocalDeviceUUID(), true, "Accelerometer", 10);
+                    mAccelerometerViewModel.setDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), true, "Accelerometer", 10);
                 }
                 else {
-                    mAccelerometerViewModel.setDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), mAccelerometerViewModel.getLocalDeviceUUID(), false, "Accelerometer", 0);
+                    mAccelerometerViewModel.setDevice(mAccelerometerViewModel.getLocalDeviceUUID(), mAccelerometerViewModel.getSystemTimeStamp(), false, "Accelerometer", 0);
                 }
 
             }
diff --git a/app/src/main/java/com/example/greenwatch/MainActivity.java b/app/src/main/java/com/example/greenwatch/MainActivity.java
index 3f6a220..022aba1 100644
--- a/app/src/main/java/com/example/greenwatch/MainActivity.java
+++ b/app/src/main/java/com/example/greenwatch/MainActivity.java
@@ -69,7 +69,7 @@ public class MainActivity extends AppCompatActivity {
             @Override
             public void onClick(View v) {
                 //openAudiodetectionActivity();
-                mMainActivityViewModel.setDevice(mMainActivityViewModel.getLocalDeviceUUID(), "10:51", "12345", false, "Audio", 10);
+                mMainActivityViewModel.setDevice(mMainActivityViewModel.getLocalDeviceUUID(), "10:51",  false, "Audio", 10);
             }
         });
         videodetectionButton.setOnClickListener(new View.OnClickListener() {
@@ -78,7 +78,7 @@ public class MainActivity extends AppCompatActivity {
                 //openVideodetectionActivity();
                 mMainActivityViewModel.setSensorType(mMainActivityViewModel.getLocalDeviceUUID(), "Video");
                 mMainActivityViewModel.setTimeStamp(mMainActivityViewModel.getLocalDeviceUUID(), "12:50");
-                mMainActivityViewModel.setDeviceID(mMainActivityViewModel.getLocalDeviceUUID(), mMainActivityViewModel.getLocalDeviceUUID());
+                mMainActivityViewModel.setDeviceID(mMainActivityViewModel.getLocalDeviceUUID(), "12345");
             }
         });
         accelerometerButton.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java b/app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java
index 31f3ee0..db6f8ac 100644
--- a/app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java
+++ b/app/src/main/java/com/example/greenwatch/repositories/DeviceRepository.java
@@ -73,18 +73,15 @@ public class DeviceRepository {
         return deviceUUID;
     }
 
-    public void setDevice(String deviceID, String timeStamp, String newDeviceID, boolean sensorStatus, String sensorType, int sensorMassage) {
+    public void setDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
         String checkedDeviceID = checkDeviceID(deviceID);
         Device device = connectedDevicesList.get(checkedDeviceID);
         if(device != null) {
             device.setTimeStamp(timeStamp);
-            device.setDeviceID(newDeviceID);
             device.setSensorStatus(sensorStatus);
             device.setSensorType(sensorType);
             device.setSensorMassage(sensorMassage);
-            setDeviceIDMapper(newDeviceID);
-            connectedDevicesList.remove(checkedDeviceID);
-            addToConnectedDeviceList(newDeviceID, device);
+            addToConnectedDeviceList(checkedDeviceID, device);
             setMutableLiveDataValue();
         }
     }
diff --git a/app/src/main/java/com/example/greenwatch/viewmodels/AccelerometerViewModel.java b/app/src/main/java/com/example/greenwatch/viewmodels/AccelerometerViewModel.java
index 9c2f860..e67f5e8 100644
--- a/app/src/main/java/com/example/greenwatch/viewmodels/AccelerometerViewModel.java
+++ b/app/src/main/java/com/example/greenwatch/viewmodels/AccelerometerViewModel.java
@@ -93,8 +93,8 @@ public class AccelerometerViewModel extends ViewModel {
         return mDeviceList;
     }
 
-    public void setDevice(String deviceID, String timeStamp, String newDeviceID, boolean sensorStatus, String sensorType, int sensorMassage) {
-        mDeviceRepository.setDevice(deviceID, timeStamp,newDeviceID, sensorStatus, sensorType, sensorMassage);
+    public void setDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+        mDeviceRepository.setDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
     public void setTimeStamp(String deviceID, String timeStamp) {
diff --git a/app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java b/app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java
index 9a4f555..e8355ae 100644
--- a/app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java
+++ b/app/src/main/java/com/example/greenwatch/viewmodels/MainActivityViewModel.java
@@ -27,8 +27,8 @@ public class MainActivityViewModel extends ViewModel {
         return mDeviceList;
     }
 
-    public void setDevice(String deviceID, String timeStamp, String newDeviceID, boolean sensorStatus, String sensorType, int sensorMassage) {
-        mDeviceRepository.setDevice(deviceID, timeStamp,newDeviceID, sensorStatus, sensorType, sensorMassage);
+    public void setDevice(String deviceID, String timeStamp, boolean sensorStatus, String sensorType, int sensorMassage) {
+        mDeviceRepository.setDevice(deviceID, timeStamp, sensorStatus, sensorType, sensorMassage);
     }
 
     public void setTimeStamp(String deviceID, String timeStamp) {