more reworking of receiving end