Some modifications.
Delete "trace"
For shuffle filter.