added more structure to class to fix commit rSK55b541133f52