diff -r 9925bc81b8a8 -r 69a9969daa41 src/js/main.js
--- a/src/js/main.js	Fri Jan 27 17:27:48 2012 +0100
+++ b/src/js/main.js	Mon Jan 30 16:23:55 2012 +0100
@@ -12,6 +12,13 @@
 	__IriSP = IriSP;
 }
 
+/* underscore comes bundled with the player and we need 
+   it ASAP, so load it that way
+*/
+
+IriSP._ = window._.noConflict();
+IriSP.underscore = IriSP._;
+
 IriSP.loadLibs = function( libs, config, metadata_url, callback ) {
     // Localize jQuery variable
 		IriSP.jQuery = null;
@@ -55,8 +62,6 @@
 
     $L.wait(function() {
       IriSP.jQuery = window.jQuery.noConflict( true );
-      IriSP._ = window._.noConflict();
-      IriSP.underscore = IriSP._;
       
       var css_link_jquery = IriSP.jQuery( "<link>", { 
         rel: "stylesheet",