small changes from review, maybe one significant change is the use of workflow variables instead of some tag / after_tag that was a bit complex