made workflow more granular