Use new quoting function