updated server behavior