Added optimizations
Added optimizations