updated server handlers