diff --git a/setup/maya/userSetup.py b/setup/maya/userSetup.py
index 7b06fe7f33..b419e9d27e 100644
--- a/setup/maya/userSetup.py
+++ b/setup/maya/userSetup.py
@@ -1,18 +1,25 @@
 import os
-import sys
 from pypeapp import config
-from pype.maya import lib
+import pype.maya.lib as mlib
 from maya import cmds
 
-def build_shelf():
-    presets = config.get_presets()
-    shelf_preset = presets['maya'].get('project_shelf')
-    if shelf_preset:
-        project = os.environ["AVALON_PROJECT"]
 
-        for k, v in shelf_preset['imports'].items():
-            sys.modules[k] = __import__(v, fromlist=[project])
+print("starting PYPE usersetup")
 
-        lib.shelf(name=shelf_preset['name'], preset=shelf_preset)
+# build a shelf
+presets = config.get_presets()
+shelf_preset = presets['maya'].get('project_shelf')
 
-cmds.evalDeferred("build_shelf()")
+
+if shelf_preset:
+    project = os.environ["AVALON_PROJECT"]
+
+    for i in shelf_preset['imports']:
+        import_string = "from {} import {}".format(project, i)
+        print(import_string)
+        exec(import_string)
+
+cmds.evalDeferred("mlib.shelf(name=shelf_preset['name'], preset=shelf_preset)")
+
+
+print("finished PYPE usersetup")