Just some reordering in commander