Update with Optimizations