more work on workflow resolution