Fix result of calculus, but need some new stuffs