spells – How much Hit Points does casting a two action heightened 2-nd level Heal restore?

Heal

You channel positive energy to heal the living or damage the undead. If the target is a willing living creature, you restore 1d8 Hit Points.

Two Actions (somatic, verbal) The spell has a range of 30 feet. If you’re healing a living creature, increase the Hit Points restored by 8.

Heightened (+1) The amount of healing or damage increases by 1d8, and the extra healing for the 2-action version increases by 8.

I’m reading this as a two action heightened 2-nd level Heal restoring 2d8+16 Hit Points. Am I interpreting this correctly?