Raj DEFECT FIXES