Update to hopefully solve bt issues