added tbd functionality