Update 1.2

Optimization Fixes.