slight reordering