updated new classes