Added callbacks and comments