added loader and fixed head from conflict