Added calculator for automatic check