New Class, some changes