with server handler changes