Added a new class and new comments