More edits to structure