more edits to attribute order