Made loading work finally