Server revised