returned to 1st variant of server with some additional features