Optimizations in execution
Fixed merge