Experimenting a little more with optimizations