Change order to make more sense