Changed some orderings