Debugging changes
Fixing self invalidation