Optimizations
Tweaked ranging.