callback handling improved.