added some bells and whistles