changed some stuff with loading
resolved conflict