shuffle to ease pull req. from Giulio