improved the way we set the default parameters