Updated receiver and sender