updated server handler