changes to passing of kwargs