restore Nicolas desired behaviour for light system assign
add some doc