Added accurate calculations