Change Tpre and Tpost calculation