less racy reloading, still needs major cleanup