Added correct and full callback method