Ebb updates

more EBB stuff