added light stuff for distance
Merge origin/master