v1.2

Optimized code