Now also use the new parameters :)