How many points can be claimed if project is served with 100% Renewable Energy?

For LEED V4 NC, we need to demonstrate 5% of Energy Savings compared to ASHRAE Baseline through Energy Modelling.

For rest of 95% of Energy, if it is served by 100% Renewables, then my understanding is that we can claim 18 Points in EA CREDIT: OPTIMIZE ENERGY PERFORMANCE and this will automatically award 3 Points for EA CREDIT: RENEWABLE ENERGY PRODUCTION.

As a summary, if project is served by 100% renewables, then my understanding is that total of 21 points shall be awarded.

Please confirm if my understanding is correct.

Many Thanks