Some modifications, testing sending/receiving