More refined xbee integration