Further clarifications, added missing flows