fixing shuffle and interactions