add givers & fix bokeh