Changed evict function