diff --git a/tune-mouse b/tune-mouse
index 19152af..cb932ec 100755
--- a/tune-mouse
+++ b/tune-mouse
@@ -1,4 +1,42 @@
 #!/bin/sh
 
 xinput set-prop "$(cat ~/.touchpad-name)" "libinput Natural Scrolling Enabled" 1
-!
+
+# Only continue if there is wacom stuff
+if ! xinput list | grep -i wacom -q; then
+    exit 0
+fi
+
+if [ $# -eq 1 ]; then
+    display=$1
+else
+    display=eDP1
+fi
+
+
+xsetwacom --set "Wacom HID 484C Finger touch" MapToOutput "$display"
+xsetwacom --set "Wacom HID 484C Pen stylus" MapToOutput "$display"
+
+exit 0
+
+devfinger="Wacom Bamboo 16FG 4x5 Finger"
+
+xinput set-prop "$devfinger" "Device Enabled" 0
+
+#xsetwacom --set "Wacom Bamboo 16FG 4x5 Pen stylus" MapToOutput $display
+#xsetwacom --set "Wacom Bamboo 16FG 4x5 Pen eraser" MapToOutput $display
+
+exit 0
+
+# xinput set-prop "Wacom Bamboo 16FG 4x5 Finger pad" "Device Enabled" 0
+
+xsetwacom --set "Wacom Bamboo 16FG 4x5 Pen stylus" mode relative
+
+xinput set-prop "Wacom Bamboo 16FG 4x5 Pen stylus" "Device Accel Constant Deceleration" 4
+xinput set-prop "Wacom Bamboo 16FG 4x5 Pen stylus" "Device Accel Adaptive Deceleration" 2
+
+# Rotate so usb cable is not disturbing me
+# xinput set-prop 14 "Evdev Axis Inversion" 1 1
+# xsetwacom --set "Wacom Bamboo 16FG 4x5 Pen" MapToOutput LVDS1
+
+exit 0
diff --git a/wacom-tuning b/wacom-tuning
deleted file mode 100755
index 7bf3d63..0000000
--- a/wacom-tuning
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 1 ]; then
-    display=$1
-else
-    display=eDP1
-fi
-
-
-xsetwacom --set "Wacom HID 484C Finger" MapToOutput "$display"
-xsetwacom --set "Wacom HID 484C Pen Pen (0)" MapToOutput "$display"
-
-exit 0
-
-devfinger="Wacom Bamboo 16FG 4x5 Finger"
-
-xinput set-prop "$devfinger" "Device Enabled" 0
-
-#xsetwacom --set "Wacom Bamboo 16FG 4x5 Pen stylus" MapToOutput $display
-#xsetwacom --set "Wacom Bamboo 16FG 4x5 Pen eraser" MapToOutput $display
-
-exit 0
-
-# xinput set-prop "Wacom Bamboo 16FG 4x5 Finger pad" "Device Enabled" 0
-
-xsetwacom --set "Wacom Bamboo 16FG 4x5 Pen stylus" mode relative
-
-xinput set-prop "Wacom Bamboo 16FG 4x5 Pen stylus" "Device Accel Constant Deceleration" 4
-xinput set-prop "Wacom Bamboo 16FG 4x5 Pen stylus" "Device Accel Adaptive Deceleration" 2
-
-# Rotate so usb cable is not disturbing me
-# xinput set-prop 14 "Evdev Axis Inversion" 1 1
-# xsetwacom --set "Wacom Bamboo 16FG 4x5 Pen" MapToOutput LVDS1
-
-exit 0