added loader and some shits