Added a new class and corrected comments