Buff evaluation a bit.