Improved how  is loaded