expanded wavelength range; added +1 to weighting