rolling in changes for eda compatibaility