Pawel's defect1 changes