Speed optimization

v1.0.1