UPDATE: Tuned rate calculation, carried manual rate changes over to
invoice rate