Updated the loading stuff