Reshuffle, add validity UC