Change to use new method