Added calculation updates for yield