Update Calculator (add log method and some check)