Almost finished the corrected version.