Also we need to use it in more models to see whether we need to change the method arguments.