CHANGE: renamed Xbee to Comm