merged too much to btas branch. fixed