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

This reverts commit 7542e23af6b04a16710fe7c9c3d1e6a85088b03e.