re-structuring workflow