Valuation TPD minor changes