UPDATE: first efforts of new class definitions