#5: updated senders for new interface proposal