Updated to match the argument name changes.