Fixed last second reordering of function parameters in last commit

Accidently only reordered the order in the definition but not in the calls