Changed to ServerSocket and Socket