More restructures, non-working state