change the order of a couple things