Reorder defn only