Improve all in one

Signed-off-by: Flavien Quesnel <flavien.quesnel@irt-systemx.fr>