Updated percentages, added certain parts that were missing