Import from EDA1 prototype