more import speedups
more speedup