Updates to the math classes