The mercury free lamp model previously discussed in Gnybida et al (2014 J. Phys. D: Appl. Phys. 47 125201) did not account for selfconsistent diffusion and only included two molecular transitions. In this paper we apply, for the first time, a selfconsistent diffusion algorithm that features (1) species/mass conservation up to machine accuracy and (2) an arbitrary mix of integral (total mass) and local (cold spot) constraints on the composition. Another advantage of this model is that the total pressure of the gas is calculated self consistently. Therefore, the usage of a predetermined pressure is no longer required.Additionally, the number of association processes has been increased from 2 to 6. The population as a function of interatomic separation determines the spectrum of the emitted continuum radiation. Previously, this population was calculated using the limit of low densities. In this work an expression is used that removes this limitation. The result of these improvements is that the agreement between the simulated and measured spectra has improved considerably.