wip-cleaning-up-send-receive