Refine buff_change