Commit No. 02. Corrections are done