Fixed receiver and sender, removed most threading