A little bit of reordering