Percentage calculation added, first draft