Better calculation