continue tweaking the buzz integration