Various optimizations for speed, no longer need full resources