Changed output order