Modified Calculated Bolus Functions

More consistency across functions