added kJ and MJ support