Add shuffle for ww1