Slight restructuring