the old nav_roll will be used for the 2.50 release to prevent the need for re-tuning. For the release after that we will use the new calculation