Change order around a bit