few more updates
added custom listener class