Some coments was changed