Modifications

Signed-off-by: Mickael Fleurus <fleurusmickael@gmail.com>