Changing the way the payment is calculated. Closes #132