switched to new method.