Reverted some of the loading changes
The order doesn't make the loading quicker, as it should be loaded even before calling the thread.