Changed light handling