Updated Workflows - minor changes in logic