Pedro, I'm starting to have doubts about this. The problem I see is that TOTAL doesn't just control the delivery order, but also whether the local node receives the command. So I think it would be better to keep it as a separate option.