Adjust initial M_UP
Remove shitty code
Rename t0 and t1