Added first-iteration light support