[2.0] Refacto