Finalisation v1

Signed-off-by: Yann <nayplatypusmith@live.fr>