This one looks right. Only thing I'd add is Gelant aged 32 I think will come back into contention more now that he is playing regularly for the Stormers. He really messed things up for himself moving overseas. Likely would be in the squad now if he didn't switch over to France.