@James *******
yes that is correct. I'm trying to see if there is a way I can save some money by not having to get a new visa and simply extend my current one and get it to become multi entry.
Non O's used to be year-long, weren't they? I am not sure why validity is so short now