Changed loading a bit