Changed some default parameters