[-] BO : Refacto part 2