Require.js changes - still in progress