Code Optimizations 2

Preparing for next schedule