fixed the integration with the GUI