added some class in case 2