Change order of final commands