Added shuffled {T,S} option to decoding