Final changes
Defect ABC