still tweaking invalidation