Final server commit