added light layers and re-added light support