A bit of tinkering with the TSS