Reworked so uprating updates automatically

Added calculations & reworked so uprating figures are updated
automatically.