Feature/n4 refacto3