One new class and some changes to old ones