An extended quasi two-phase mass flow model. (November 2018)