Equations now work in the proper way