Some re-structuring