added 2 new classes