Working on Defect modeling