Add Klaus and remove Jenny