added few more bells and whistles