restructuring carlos' stuff