Updated to use percentages betterw