Added exteded devicelight detection