AMENDED AND RESTATED YIELD CALCULATION SERVICES AGREEMENT