Updated flow