Change order parameters to make commands clearer