Changed some arguments