Added reduced redundancy, CF invalidation