changed some default parameters