Slight re-orginization of flowHistory section.