Fixing ordering and adding states for decom