add some bells and whistles