Improved loading of initial world