Improved add_possible_tb