Flows reimplemented and  particle saving now if correct