Handling more lighting cases

Change-Id: Ie016f786c6a9e9e21b890a9b59a55f73b6ed2c0c