starting to implement invalidation