Adding fine tuning with no hidden stuff
Fixing merge conflict