Improved shuffle speed slightly.