updated to current ebus source