Edits for longhorn