GUILogic commit Jonathan