added some bells and whistles and transitions