Small ocd reshuffle