Significant speed improvement

Huge improvement