some changes with @bbest during Tbx learning session