diff --git a/bin/fluents b/bin/fluents
index 00b359a..98a4b67 100755
--- a/bin/fluents
+++ b/bin/fluents
@@ -4,7 +4,7 @@ from getopt import getopt
 import os
 import sys
 from fluents import fluents, project, workflow, main
-import workflows
+#import workflows
 import cfgparse, optparse
 
 PROGRAM_NAME = 'fluents'
@@ -50,24 +50,26 @@ def parse_options():
     return cp.parse(op)
     
 if __name__ == '__main__':
+    import gtk
+    import gnome
+    
+    foo = gnome.program_init(PROGRAM_NAME, VERSION)
+    print foo
+
     options, params = parse_options()
     
     if options.list_workflows:
         list_workflows()
         sys.exit(0)
 
-    import gtk
-    import gnome
-    
-    gnome.program_init(PROGRAM_NAME, VERSION)
-
-    selected_wf = workflow.EmptyWorkflow
-
-    workflow_list = workflow.workflow_list()
-    for wf in workflow_list:
-        if wf.ident == options.workflow:
-            selected_wf = wf            
+    selected_wf = workflow.find_workflow(options.workflow) 
+    print selected_wf
+    if selected_wf == None: selected_wf = workflow.EmptyWorkflow
 
+#    workflow_list = workflow.workflow_list()
+#    for wf in workflow_list:
+#        if wf.ident == options.workflow:
+#            selected_wf = wf            
 
     main.set_workflow(selected_wf())
     main.set_options(options)
diff --git a/run-fluents b/run-fluents
index f756e45..ad4e0db 100755
--- a/run-fluents
+++ b/run-fluents
@@ -3,6 +3,6 @@
 ## To be able to run fluents without installing it, we have to set
 ## PYTHONPATH.
 
-export PYTHONPATH=$PYTHONPATH:. 
+export PYTHONPATH=$PYTHONPATH:.:./workflows
 ./bin/fluents $@