Slight restructuration