Adding additional params
resolving merge conflict