[-] BO : Refacto part 1