almost complete flow v2