Index: denali.pro.user
===================================================================
diff -u -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e -ra64c31ec79b3af203691f70397cc31f5727f47f4
--- denali.pro.user	(.../denali.pro.user)	(revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e)
+++ denali.pro.user	(.../denali.pro.user)	(revision a64c31ec79b3af203691f70397cc31f5727f47f4)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2021-05-04T04:09:21. -->
+<!-- Written by QtCreator 4.10.0, 2021-05-04T15:26:07. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
Index: en_US.udic
===================================================================
diff -u -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e -ra64c31ec79b3af203691f70397cc31f5727f47f4
--- en_US.udic	(.../en_US.udic)	(revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e)
+++ en_US.udic	(.../en_US.udic)	(revision a64c31ec79b3af203691f70397cc31f5727f47f4)
@@ -96,3 +96,7 @@
 accessor
 init
 Trtmt
+Globals
+sdcard
+usb
+VM
Index: resources/settings/Instructions/Instructions.conf
===================================================================
diff -u -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e -ra64c31ec79b3af203691f70397cc31f5727f47f4
--- resources/settings/Instructions/Instructions.conf	(.../Instructions.conf)	(revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e)
+++ resources/settings/Instructions/Instructions.conf	(.../Instructions.conf)	(revision a64c31ec79b3af203691f70397cc31f5727f47f4)
@@ -6,3 +6,5 @@
 [Disposables^Cartridge Connection]
 Connect dialyzer v1                             = slide2_filter-connect_v1.png
 
+[Sample^Water Sample]
+Please follow the instruction to sample the water   = water sampling_v1.png 
Index: resources/settings/Instructions/water sampling_v1.png
===================================================================
diff -u
Binary files differ
Index: sources/storage/DriveWatcher.cpp
===================================================================
diff -u -re159592e3a99658e661ab83fffef43322dc075f3 -ra64c31ec79b3af203691f70397cc31f5727f47f4
--- sources/storage/DriveWatcher.cpp	(.../DriveWatcher.cpp)	(revision e159592e3a99658e661ab83fffef43322dc075f3)
+++ sources/storage/DriveWatcher.cpp	(.../DriveWatcher.cpp)	(revision a64c31ec79b3af203691f70397cc31f5727f47f4)
@@ -152,9 +152,17 @@
 bool DriveWatcher::usbSeek(QString &vDevice)
 {
     // coco begin validated: Needed User Interaction so tested manually
+    // This function cannot be tested on any device other than target
+    // because only on device the usb is /dev/sdX# and others are mmblk___
+    // but on VM and normal Linuxes all drives are /dev/sdX# and cannot be identified as USB.
+    // And the difference between how USB is detected and sd-card is that
+    // for the USB we need to look into /dev/sdX#
+    // but for the sd-card we look for the mounted path which is much easier.
+    // That's why indication of the sd-card is more accurate than USB at least on VM.
+    QString dev = "/dev/sd";
     QString device = "";
     for (char a = 'a'; a <= 'z'; a++) {
-        device = QString("/dev/sd%1%2").arg(a).arg('1');
+        device = dev + a + '1';
         if (QFileInfo::exists(device)) {
             vDevice = device;
             return true; // application is deciding on the first existing drive
Index: sources/storage/StorageGlobals.cpp
===================================================================
diff -u -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e -ra64c31ec79b3af203691f70397cc31f5727f47f4
--- sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e)
+++ sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision a64c31ec79b3af203691f70397cc31f5727f47f4)
@@ -32,18 +32,18 @@
 #ifdef BUILD_FOR_TARGET
     const char  *USB_Mount_Point = "/media/usb/";
 #else
-    const char  *USB_Mount_Point = "/home/denali/Desktop/USB DISK/";
+    const char  *USB_Mount_Point = "/media/denali/usb-disk/";
 #endif
 
     const char  *USB_File_System = "vfat";
 
     // SD-CARD
-    const short Available_Space_Percent = 15; // currently 16GB SD-Card so 2.4GB should always be available.
+    const short Available_Space_Percent = 15;
 #ifdef BUILD_FOR_TARGET
     const char  *SDCard_Base_Path_Name = "/media/sd-card/";
 #else
     // should not be in the project application folder. [not tracking by git]
-    const char  *SDCard_Base_Path_Name = "/media/denali/USB DISK/";
+    const char  *SDCard_Base_Path_Name = "/media/denali/sd-card/";
 #endif
 
     // Settings
@@ -69,5 +69,5 @@
     // Treatment
     // Please notice that is the folder not the path
     // and it needs to be concatenated after SDCard_Base_Path_Name for each build configuration
-    const char *Treatment_Log_Folder = "treatments/";
+    const char *Treatment_Log_Folder = "treatment/";
 }