Changes to connect, receive