diff --git a/__init__.py b/__init__.py
index 83c1760..4c11a46 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,17 +1,16 @@
-from adapt.intent import IntentBuilder
 from mycroft import MycroftSkill, intent_handler
 
 class RunScriptSkill(MycroftSkill):
     def __init__(self):
         super().__init__()
-        self.learning = true
 
     def initialize(self):
         script_dir = self.settings.get('script_dir')
 
-    @intent_handler(IntentBuilder('RunScriptIntent').require('RunScriptKeyword'))
-    def handle_run_script_intent(self, message):
-        self.speak_dialog("running")
+    @intent_handler('RunScript.intent')
+    def handle_run_script_intent(self, msg=None):
+        script = msg.data.get('script', None)
+        self.speak_dialog('Running', {'script': script})
 
     def stop(self):
         pass
diff --git a/dialog/en-us/Running.dialog b/dialog/en-us/Running.dialog
new file mode 100644
index 0000000..fa79af0
--- /dev/null
+++ b/dialog/en-us/Running.dialog
@@ -0,0 +1 @@
+Okay. I'm running the {{script}} script.
diff --git a/dialog/en-us/running.dialog b/dialog/en-us/running.dialog
deleted file mode 100644
index 3a94c30..0000000
--- a/dialog/en-us/running.dialog
+++ /dev/null
@@ -1 +0,0 @@
-Okay. I'm running the script.
diff --git a/vocab/en-us/RunScript.intent b/vocab/en-us/RunScript.intent
new file mode 100644
index 0000000..08fe28e
--- /dev/null
+++ b/vocab/en-us/RunScript.intent
@@ -0,0 +1,2 @@
+(run|execute) (the|my|your) {script} script
+(run|execute) {script} script
diff --git a/vocab/en-us/RunScriptKeyword.voc b/vocab/en-us/RunScriptKeyword.voc
deleted file mode 100644
index bdf6cf6..0000000
--- a/vocab/en-us/RunScriptKeyword.voc
+++ /dev/null
@@ -1,6 +0,0 @@
-run script
-run the script
-run my script
-execute script
-execute the script
-execute my script