fixed more with loading