Edits for hammerhead