Buff sorting added