Optimizations made