Reorganisation. Getting closer to mention persistance.