Pawel's defect7 changes