Changed input order