Compatable with New Adaptive calc