Added State ID Reshuffle