Restructured State flow