added two new classes