update math integration with latest change from core