#85 Reordering again