Adding speedup feature