More Heritage edits