Little bit of reordering