changed input order