Think Martin now has a version 3.1 for his flow estimator: LINK