adjustments to latest L3 structure