Added some more math