Merged stuff developed at chalmers, removed TBs