correctly fixed the mapping
Partly added perecentages.
Partly added percentages.