change kwargs to be more self consistent