[FIX] added some more design made the loader better