Renamed **kwargs to **params as appropriate