Updated server funcitions