Added more use of new method