TSO redesign

by Patryk Ciacma