Thank you, Don.
Sure would have been easier if the Riv just changed their basic design every so often..