moved more to GUI
merge