Luminator suggestions & possible rework