some important changes
2 new class