Everything corrected