Override only params we need

see the second commit