Changed default kwarg values