tweaked workflow, so simpler