Some changes, basically by external lector, part 3