Refactor way we compute the limit.