fix and simplify workflow
add conditions