Fixed model, added pourcentage
fixed merge conflict