Changes made to socket system(Still not complete)