Tweak some params
Merged