Pawel's defect5 changes