Removed means for several light sources, added means for average light source