Must add NEW method, deprecating old one.