defects fixed!