Include environment changes and evict… — Code review | OneNoughtOne