Added more on the recive part

Needs some cleaning