Change order of arguments, update documentation