updated for flow rate and new user fields