updated optimizations