Modifs bd + refactor
merge avt commit