1.1 refacto