Edits for initial deployment