diff --git a/.profile.roku b/.profile.roku
index b5c669b..9307da3 100644
--- a/.profile.roku
+++ b/.profile.roku
@@ -225,6 +225,24 @@ rokuget()
     wget --no-check-certificate --user=vkhachatryan --ask-password $1
 }
 
+###############################################################################
+#
+#   Downloaded logs.
+#
+jfile()
+{
+    local NTH_LOG_FILE=1
+    if [ "$1" != "" ]; then
+        NTH_LOG_FILE=$1
+    fi
+    echo $PWD/$(ls -t1 S0* | head -$NTH_LOG_FILE | tail -1)
+}
+
+jcat()
+{
+    cat $(jfile $1)
+}
+
 ###############################################################################
 #
 #   Other helpers
diff --git a/plugfest b/plugfest
index c316549..08a6c47 100755
--- a/plugfest
+++ b/plugfest
@@ -46,48 +46,30 @@ device_echo "Testing Begin"
 device_cmd "ConfigService -ro"
 device_cmd "ConfigService -so fw.fastboot.capture.snapshot=false"
 device_cmd "ConfigService -so fw.apibroker.failsafe-disable=true"
+device_cmd "ConfigService -so fw.display-doctor-2.enabled=false"
+device_cmd "ConfigService -so fw.display-doctor-2-settings.enabled=false"
 device_cmd "ConfigService -lo"
-echo_and_wait "Reboot Device"
+device_cmd "[ -e /dev/mapper/snapshotree ] && mkswap /dev/mapper/snapshotree"
 device_cmd "reboot"
 
-device_echo "#1: Running from TV USB"
-echo_and_wait "Plug device from the TV USB, and wait till it boots"
-echo_and_wait "Run Netflix"
-echo_and_wait "Run BBC"
+device_echo "#1: Test Display Doctor 1"
+echo_and_wait "Test Netflix & BBC"
 
 device_echo "#2: Test All HDMI Ports. Hot plug in/plug out"
-echo_and_wait "Plug device from the first HDMI: "
-echo_and_wait "Plug device from the second HDMI: "
-echo_and_wait "Plug device from the third HDMI: "
-echo_and_wait "Plug device from the forth HDMI: "
+echo_and_wait "Plug/unplug device from HDMIs: "
 
 device_echo "#3: CEC related tests"
 echo_and_wait "Does Roku Name appear as the source input"
-echo_and_wait "Turn CEC functionality ON"
-echo_and_wait "Turn CEC functionality OFF"
-
-device_echo "#4: Test Display Doctor 1"
-echo_and_wait "'Enter' to configure reboot"
-device_cmd "ConfigService -so fw.display-doctor-2.enabled=false"
-device_cmd "ConfigService -so fw.display-doctor-2-settings.enabled=false"
-device_cmd "reboot"
-echo_and_wait "Set Display Settings to 4K DolbyVision: "
-echo_and_wait "Set Display Settings to 4K HDR: "
-echo_and_wait "Set Display Settings to 4K: "
-echo_and_wait "Set Display Settings to 1080p: "
-echo_and_wait "Set Display Settings to 720p: "
+echo_and_wait "Test CEC functionality"
 
+device_echo "#0: Running from TV USB"
 device_echo "#5: Test Display Doctor 2"
 echo_and_wait "'Enter' to configure and reboot"
 device_cmd "ConfigService -so fw.display-doctor-2.enabled=true"
 device_cmd "ConfigService -so fw.display-doctor-2-settings.enabled=true"
-echo_and_wait "Reboot Device"
-device_cmd "reboot"
-echo_and_wait "Set Display Settings to 4K DolbyVision: "
-echo_and_wait "Set Display Settings to 4K HDR: "
-echo_and_wait "Set Display Settings to 4K: "
-echo_and_wait "Set Display Settings to 1080p: "
-echo_and_wait "Set Display Settings to 720p: "
+echo_and_wait "Check display doctor 2: "
+echo_and_wait "Plug device from the TV USB, and wait till it boots, test Display Doctor2"
+
 
 echo_and_wait "'Enter' to finish test"
 device_echo "Testing Done"