Changing the order of the arguments to make them more consistent with the name of the function
Changing more of the argument orders