Updated flow for leaders/non-leaders