converted from using parseClass to real classes