added loading properly