updated auto loader