Added changes to yield calculations.