add missing changes. Forgot to commit
next try to solve the json/args issue. If not working revert.