match docstring with actual arg names
merge; don't understand why this needs to be a merge