- some speedup enhancments