Added some default values
Merged