[tb] adaptation to new API (draft)