modify some loading logic