Changed workflow and GUI