Add more light control