Can we move this into the receive_messages?