workshop flow fixed