Updated to GUI version