Add some bells and whistles.