Majro rework of class