Updated Math computation