Removed luminescence, added multi-sensor