Added new class
testing merge