Improving the equity calculator