added tb... still needs a lot of testing