Logic and logicGUI merged