Added Sender logic