Changes BT stuff
Merge changes