improved flow-type model