Upgraded to new shiny buff API