small adaptation for the stanford server