Added more func to TB