refacto / maj planning.