Speedup and redesign.