@davestgermain I am not addressing the user experience, just how the code looks in the changes you are making.