[1.0] Refacto