updated for EBI setup