Updated Receiver and Sender