moved more bookkeeping to cyclicworkflow