Update on socket and comment