renamed some methods
moving the call to callback to the right place