Edits for non-platform version