Final server changes