time fix, more shuffle$