Commit for merge

Next: Augmenting BT