most parameters can be adjusted in one file
merge conflict fixed