Remove Dietrich and RI, add Peter and Patrick, reshuffle