changed optimizations