I believe you do have it figured out

Thanks for the great pics.