Improved samples/stc