Put the bbatsov back in