Improve shuffling indicator