rearranged, added tau

[ci skip]