adjusted to current ebusd source