Changed order of input types