Did some reordering