merged edos and jrafx into rui
other?