Restructuring according to Marcel's mail