Corrected mistakes?