new structure in 2.2