Fixing first 3 defects