Adjust to new method