Made default parameters more consistent with examples