added more bells and whistles