Changed order for inputs