Adapting to new method signature again
Adapting to new method signature again