Both possibilities I can do, no problem, it depends on the question to which extent APR is really working in your organization.
As has been informed, and which also can be seen when doing the actual testing, the new APR is less complicated. So this can benefit a more smooth implementation.
Just let me know your preference