Rebuilt all equations as a test