Switch to new method