Toning up state organisation