Added extra light switches