added a notice, and default values
merge