Light functionality added (Draft)