tsv_buddy revised