This needs to be made consistent with the rewriting of the Luminosity class.
This needs to be made consistent with the rewriting of the Luminosity class.