added server and socket