Why this change, I'm not even sure where max_range is calculated.