merged latest commits and created new class