fixed up loading process