update
Optimization changes