edits for server