Mine is made more complicated by the fact my flight will be to Mashatu and an overnight in JNB can't be avoided. At the moment scheduled to leave the evening Day 1 ( and hoping that by then a same day PCR test is available in my area). Coming from the NYC area. Get into J'berg evening Day 2 and then a charter into Mashatu the next morning. Even with the most rapid testing, given the time change which I assume won't be taken into account at the Botswana border, think I have to take another test in JNB.. Hope that by August this will be modified or at least some concession for those of us who've been fortunate enough to be vaccinated. Otherwise I won't get back to Botswana this year. Hope that the Botswana Gov take the usual need to connect in JNB into consideration - maybe five days from a covid test if transiting in ZA might be more appropriate.