Changed the way world is loaded

Changed the way world is loaded