changed some default arguments