Added GUI-Support again