UPDATED flow