Changed percent from string to double, added weight