Some changes to send/recieve during class