Move parameters into correct order