Change params order

Comments and suggestions welcome!