changed tau_p
merge