Tying off loose ends (Valdera-Xaspesh diplo)