Revert "Revert "Revert "Revert "Revert "Revert "Lights changes from ronasimi and paulicat""""""

This reverts commit 81cad3af367f51aabc785574de95bc0ec40e57ac.