Changes to Buff