Change some params ordering