Some Changes to Buff Command