More optimizations!