Modified some arguments