Added new method
Refactoring
Change to callback structure
Change of method name
Revised