Improving equations
Major changes