Commit No. 6 - Final modifications - Pre Level-2