Second order flow handling added