                 (proxy [UIJob] ["Start Labrepl Session and Browser"]
 			            (runInUIThread [monitor]
 			              (.launch (ClojureLaunchShortcut.) startup-file-selection ILaunchManager/RUN_MODE)
-										(let [console (wait-for-resource #(ClojureClient/findActiveReplConsole) 30000 100)]
+										(let [console (wait-for-resource #(ClojureClient/findActiveReplConsole) *timeout* *step*)]
                       (if console
                         (do
 	                        (EvaluateTextAction/evaluateText console "(labrepl/-main)")
-                          ; (wait-for-server)
-                          (Thread/sleep 10000)
 										      (open-browser)
                           Status/OK_STATUS)
                         Status/CANCEL_STATUS))))]

  (:gen-class
   :implements [org.eclipse.jface.operation.IRunnableWithProgress]
   :constructors {[ccw.support.labrepl.wizards.LabreplCreateProjectPage org.eclipse.ui.dialogs.IOverwriteQuery] []}
   :init myinit
   :state state))

(def *port* 8080)

(defn- -myinit
  [pages overwrite-query]
  [[] (ref {:page pages :overwrite-query overwrite-query})])


(defn- open-browser
"Open a browser for the running labrepl web page"
[]
	(if (wait-for-resource check-server *timeout* *step*)
   (let
	  [browser-support (.getBrowserSupport (PlatformUI/getWorkbench))
	   browser
