Add bells and whistles