Begin Changes for Bluetooth and Edison usage