Changed some values to calculate the initial percentages in a better way,