More optimizations and timers