Change order of arguments to have more sense