Edits for new server