Continuing work on server changes.