Some changes for sending to multiple devices