Added logic for old vs new rates.
Fix bug where if any part of plan is XS split results in NaN for all lines.